functions.php and other code-related changes

.gitignore

@@ -1,2 +1,2 @@
 *~
-
+.directory

404.php

@@ -11,6 +11,6 @@
 	<div class="post-page-foot"></div>
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

archive-comic-calendar.php

@@ -120,12 +120,12 @@ $month['12'] = array('month' => 'December', 'days' => '31');
 
 	<div class="post-page-head"></div>
 	<div class="post-page">
-
-		<h2 class="pagetitle"><span class="archive-year"><?php echo $archive_year ?></span> <?php the_title() ?></h2>
-		
+    <?php while (have_posts()) : the_post() ?>
       <div class="entry">
-			<?php while (have_posts()) : the_post(); the_content(); endwhile; ?>
+        <h2 class="pagetitle"><span class="archive-year"><?php echo $archive_year; ?></span> <?php the_title() ?></h2>
+        <?php the_content(); ?>
       </div>
+    <?php endwhile; ?>
 
 		<div class="archive-yearlist">| 
 			<?php $years = $wpdb->get_col("SELECT DISTINCT YEAR(post_date) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date ASC");
@@ -166,6 +166,6 @@ $month['12'] = array('month' => 'December', 'days' => '31');
 
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

archive-comic-storyline-thumbs.php

@@ -65,10 +65,12 @@ Template Name: Comic Storyline with Thumbs
 
 	<div class="post-page-head"></div>
 	<div class="post-page">
-		<h2 class="pagetitle"><?php the_title() ?></h2>
+    <?php while (have_posts()) : the_post(); ?>
       <div class="entry">
-			<?php while (have_posts()) : the_post(); the_content(); endwhile; ?>
+        <h2 class="pagetitle"><?php the_title() ?></h2>
+        <?php the_content(); ?>
       </div>
+    <?php endwhile; ?>
 		<ul id="storyline" class="level-0">
 			<?php if (get_option('comicpress-enable-storyline-support') == 1) {
 				if (($result = get_option("comicpress-storyline-category-order")) !== false) {
@@ -126,6 +128,6 @@ Template Name: Comic Storyline with Thumbs
 	
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

archive-comic-storyline.php

@@ -64,11 +64,12 @@ Template Name: Comic Storyline Archive
 <div id="content" class="narrowcolumn">
 
 	<div class="post-page-head"></div>
-	<div class="post-page">
-		<h2 class="pagetitle"><?php the_title() ?></h2>
+    <?php while (have_posts()) : the_post() ?>
       <div class="entry">
-			<?php while (have_posts()) : the_post(); the_content(); endwhile; ?>
+        <h2 class="pagetitle"><?php the_title() ?></h2>
+        <?php the_content(); ?>
       </div>
+    <?php endwhile; ?>
 		<ul id="storyline" class="level-0">
 			<?php if (get_option('comicpress-enable-storyline-support') == 1) {
 				if (($result = get_option("comicpress-storyline-category-order")) !== false) {
@@ -128,6 +129,6 @@ Template Name: Comic Storyline Archive
 	
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

archive-comic-year.php

@@ -37,12 +37,12 @@ Template Name: Comic Year Archive
 
 	<div class="post-page-head"></div>
 	<div class="post-page">
-
-		<h2 class="pagetitle"><span class="archive-year"><?php echo $archive_year; ?></span> <?php the_title() ?></h2>
-
+    <?php while (have_posts()) : the_post() ?>
       <div class="entry">
-			<?php while (have_posts()) : the_post(); the_content(); endwhile; ?>
+        <h2 class="pagetitle"><span class="archive-year"><?php echo $archive_year; ?></span> <?php the_title() ?></h2>
+        <?php the_content(); ?>
       </div>
+    <?php endwhile; ?>
 
 		<div class="archive-yearlist">| 
 			<?php $years = $wpdb->get_col("SELECT DISTINCT YEAR(post_date) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_date ASC");
@@ -66,6 +66,6 @@ Template Name: Comic Year Archive
 	
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

archive-comic.php

@@ -52,6 +52,6 @@ Template Name: Comic Archive
 
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

archive.php

@@ -1,6 +1,6 @@
 <?php get_header() ?>
 
-<div id="content" class="archive">
+<div id="content" class="narrowcolumn">
 
 	<?php if (have_posts()) : ?>
 
@@ -35,6 +35,12 @@
 				<div class="post-comic-head"></div>
 				<div class="post-comic">
 					<div class="comicarchiveframe" style="width:<?php echo $archive_comic_width; ?>px;">
+						<div class="comicdate">
+							<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+						</div>
+						<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+						By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('[edit this]'); ?> <br />
+						Posted in: <?php the_category(','); ?>
 						<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="Click for full size." width="<?php echo $archive_comic_width ?>" /><br />
 						<h3><?php the_title() ?></h3>
 						<small><?php the_time('F jS, Y') ?></small></a>
@@ -64,11 +70,13 @@
 
 		<?php endwhile; ?>
 
+    <?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
       <div class="pagenav">
         <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
         <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
         <div class="clear"></div>
       </div>
+    <?php } ?>
 
 	<?php else : ?>
 
@@ -85,6 +93,6 @@
 
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

archives.php

@@ -18,6 +18,6 @@ Template Name: Archives
 	<div class="post-page-foot"></div>
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

buystrip-functions.php

@@ -0,0 +1,13 @@
+<?php
+
+function buy_this_comic() {
+	$buythiscomic = get_post_meta( get_the_ID(), "buythiscomic", true );
+	if ( $buythiscomic !== 'sold' ) {
+		echo '<div class="buythis"><form method="post" action="/shop/">';
+		echo '<input type="hidden" name="comic" value="'.get_the_ID().'" />';
+		echo '<button class="buythisbutton" type="submit" value="submit" name="submit"></button></form></div>';
+		echo '<div class="clear"></div>';
+		
+	}
+}
+?>

buystrip-template.php

@@ -0,0 +1,106 @@
+<?php
+/*
+Template Name: Buy Print
+Template Author: Philip M. Hofer (Frumph)
+Template URL: http://webcomicplanet.com/forum/
+Template Author Email: philip@frumph.net
+*/
+    get_header();
+    if (isset($_REQUEST['comic'])) $comicnum = $_REQUEST['comic'];
+?>
+
+<?php get_header() ?>
+
+<div id="content" class="narrowcolumn">
+	<?php if (!empty($comicnum)): ?>
+		<?php $temppost = $post; ?>
+		<?php $post = & get_post( $comicnum ); ?>
+		<div class="post-page-head"></div>
+		<div class="post-page">
+			<div style="float:right;">
+				<br />
+				<img src="<?php bloginfo('stylesheet_directory'); ?>/images/paypal.png" alt="Powered by Paypal" /><br />
+			</div>
+			<div style="float:left;">
+				<h2 class="pagetitle">Buy Print!</h2>
+			</div>
+			<div class="clear"></div>
+			Comic ID - #<?php echo $comicnum; ?><br />
+			Title: 	<?php echo the_title(); ?><br />
+			<br />
+			<?php $post = & get_post( $comicnum ); ?>
+			<center>
+			<img src="<?php echo the_comic_archive(); ?>" alt="<?php the_title(); ?>" title="<?php the_title(); ?>" width="<?php echo $archive_comic_width; ?>" /><br />
+			<br />
+			<table>
+			<tr>
+				<td align="left" valign="center">
+						<form target="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
+						<input type="hidden" name="add" value="1">
+						<input type="hidden" name="cmd" value="_cart">
+						<input type="hidden" name="shipping2" value="5.75">
+						<input type="hidden" name="cn" value="Special Instructions (optional)">
+						<input type="hidden" name="cancel_return" value="http://comic.frumph.net/shop/">
+						<input type="hidden" name="item_name" value="Comic Strip">
+						<input type="hidden" name="notify_url" value="http://comic.frumph.net/shop/">
+						<input type="hidden" name="page_style" value="Frumph Agencies">
+						<input type="hidden" name="return" value="http://comic.frumph.net/shop/">
+						<input type="hidden" name="amount" value="23.00">
+						<input type="hidden" name="item_number" value="Comic ID (<?php echo $comicnum; ?>) - <?php echo the_title(); ?>">
+						<input type="hidden" name="business" value="frumph_dragon@yahoo.com">
+						<input type="hidden" name="shipping" value="4.75">
+						US/Canada<br>
+						$23 + $4.75 shipping<br />
+						<input type="image" src="<?php bloginfo('stylesheet_directory'); ?>/images/buynow_paypal.png" name="submit32" alt="Make payments with PayPal - it's fast, free and secure!" /> 
+						</form>
+				</td>
+				<td align="left" valign="center">
+					<form target="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post">
+						<input type="hidden" name="add" value="1">
+						<input type="hidden" name="cmd" value="_cart">
+						<input type="hidden" name="shipping2" value="20.00">
+						<input type="hidden" name="cn" value="Special Instructions (optional)">
+						<input type="hidden" name="cancel_return" value="http://comic.frumph.net/shop/">
+						<input type="hidden" name="item_name" value="Comic Strip">
+						<input type="hidden" name="notify_url" value="http://comic.frumph.net/shop/">
+						<input type="hidden" name="page_style" value="Frumph Agencies">
+						<input type="hidden" name="return" value="http://comic.frumph.net/shop/">
+						<input type="hidden" name="amount" value="23.00">
+						<input type="hidden" name="item_number" value="Comic ID (<?php echo $comicnum; ?>) - <?php echo the_title(); ?>">
+						<input type="hidden" name="business" value="frumph_dragon@yahoo.com">
+						<input type="hidden" name="shipping" value="12.00">
+						International<br>
+						$23 + $12.00 shipping<br />
+						<input type="image" src="<?php bloginfo('stylesheet_directory'); ?>/images/buynow_paypal.png" name="submit32" alt="Make payments with PayPal - it's fast, free and secure!" />
+					</form>
+				</td>
+			</tr>
+			</table>
+			<br />
+			</center>
+			The purchase of this strip is based on availability.   A Print of this strip is what you are purchasing.<br />
+			<br />
+			<?php $post = $temppost; ?>
+			<div class="clear"></div>
+		</div>
+	<?php else: ?>
+	    <?php if (have_posts()) : while (have_posts()) : the_post() ?>
+		    <div class="post-page-head"></div>
+		    <div class="post-page" id="post-<?php the_ID() ?>">
+			    <h2 class="pagetitle"><?php the_title() ?></h2>
+			    <div class="entry">
+				    <?php the_content() ?>
+				    <?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
+			    </div>
+			    <?php edit_post_link('Edit this page.', '<p>', '</p>') ?>
+			    <br class="clear-margins" />
+		    </div>
+		    <div class="post-page-foot"></div>
+	    <?php endwhile; endif; ?>
+        <?php comments_template(); ?>
+	<?php endif; ?>	
+</div>
+
+<?php get_sidebar(); ?>
+
+<?php get_footer(); ?>

comic-navigation-functions.php

@@ -0,0 +1,49 @@
+<?php
+
+function comic_navigation() {
+global $post, $wp_query;
+    $temppost = $post;
+    $temp_query = $wp_query;
+    $temp_single = $wp_query->is_single;
+	echo '<div id="comic_navi_wrapper">';
+	echo '	<div id="comic_navi_prev">';
+    $first_comic = get_first_comic_permalink();
+    if ($first_comic != get_permalink()) {
+		echo '		<a href="'.$first_comic.'" class="rollfirst" title="First">&nbsp;</a>';
+	} else {
+		echo '		<img src="'.get_bloginfo('stylesheet_directory').'/images/disabled_firstroll.png" alt="At First" style="float:left;" class="disabled_navi" />';
+	}
+    $wp_query->is_single = true;
+    $prev_comic = get_permalink(get_adjacent_post(true, '', true));
+    if (!empty($prev_comic) && (get_permalink() != $first_comic)) {
+		echo '		<a href="'.$prev_comic.'" class="rollprev" title="Previous">&nbsp;</a>';
+	} else { 
+		echo '		<img src="'.get_bloginfo('stylesheet_directory').'/images/disabled_prevroll.png" alt="No Previous" style="float:left;" class="disabled_navi" />';
+	}
+    $wp_query->is_single = $temp_single;
+	echo '	</div>';
+	echo '	<div id="comic_navi_next">';
+    $last_comic = get_last_comic_permalink();
+    if ($last_comic != get_permalink()) {
+        echo '		<a href="/" class="rolllast" title="Last">&nbsp;</a>';
+    } else {
+        echo '		<img src="'.get_bloginfo('stylesheet_directory').'/images/disabled_lastroll.png" alt="No Last" style="float: right;" class="disabled_navi" />';
+    }
+    $next_comic = get_permalink(get_adjacent_post(true, '', false));
+    if (!empty($next_comic) && (get_permalink() != $last_comic)) {
+		echo '		<a href="'.$next_comic.'" class="rollnext" title="Next">&nbsp;</a>';
+	} else {
+		echo '		<img src="'.get_bloginfo('stylesheet_directory').'/images/disabled_nextroll.png" alt="No Next" style="float: right;" class="disabled_navi" />';
+	}
+	echo '	</div>';
+	echo '	<div class="clear"></div>';
+	echo '</div>';
+    $wp_query = $temp_query;
+    $wp_query->is_single = $temp_single;
+    $post = $temp_post;
+    $temp_post = null;
+    $temp_query = null;
+    $temp_single = null;
+}
+
+?>

comicpress-config.php

@@ -1,10 +1,10 @@
 <?php
 
 //COMIC CATEGORY -the WordPress ID of your comic category (default "3").
-$comiccat = "3";
+$comiccat = "4";
 
 //BLOG CATEGORY - the WordPress ID of your blog category (default "1").
-$blogcat = "4";
+$blogcat = "3";
 
 //COMIC FOLDER - the folder your comics files are located in (default "comics")
 $comic_folder = "comics";

comment-functions.php

@@ -0,0 +1,232 @@
+<?php
+
+/**
+* Better display of avatars in comments
+* Should only be used in comment sections (may update in future)
+* Checks for false empty commenter URLs 'http://' w/registered users
+* Adds the class 'photo' to the image
+* Adds a call to 'images/trackback.jpg' for trackbacks
+* Adds a call to 'images/pingback.jpg' for pingbacks
+*
+* Filters should only return a string for an image URL for the avatar with class $avatar
+* They should not get the avatar as this is done after the filter
+*
+* @since 0.2
+* @filter
+*/
+function comicpress_avatar() {
+	global $comment;
+
+	$url = get_comment_author_url();
+
+	$comment_type = get_comment_type();
+
+	if($comment_type == 'trackback') :
+		$avatar = '/images/trackback.png';
+
+	elseif($comment_type == 'pingback') :
+		$avatar = '/images/pingback.png';
+
+	elseif(get_settings('avatar_default')):
+		$avatar = get_settings('avatar_default');
+
+	endif;
+
+//	$avatar = apply_filters('comicpress_avatar', $avatar);
+	if($url == true && $url != 'http://')
+		echo '<a href="' . $url . '" rel="external nofollow" title="' . wp_specialchars(get_comment_author(), 1) . '">';
+
+	if(function_exists('get_avatar') && $comment_type != 'pingback' && $comment_type != 'trackback' ) { 
+		echo str_replace("alt='", "alt='".wp_specialchars(get_comment_author(), 1)."' title='".wp_specialchars(get_comment_author(), 1), get_avatar(get_comment_author_email(), 64));
+	} else {
+		echo '<img src="'.get_bloginfo('stylesheet_directory').$avatar.'" class="avatar photo" />';
+	}
+	
+	if($url == true && $url != 'http://')
+		echo '</a>';
+}
+
+/**
+* Displays individual comments
+* Uses the callback parameter for wp_list_comments
+* Overwrites the default display of comments
+*
+* @since 0.2.3
+*
+* @param $comment The comment variable
+* @param $args Array of arguments passed from wp_list_comments
+* @param $depth What level the particular comment is
+*/
+function comicpress_comments_callback($comment, $args, $depth) {
+	$GLOBALS['comment'] = $comment;
+	$GLOBALS['comment_depth'] = $depth;
+?>
+
+	<li id="comment-<?php comment_ID(); ?>" class="<?php comicpress_comment_class(); ?>">
+
+		<?php comicpress_avatar(); // Avatar filter ?>
+		<div class="comment-meta-data">
+
+			<div class="comment-author vcard">
+				<?php comicpress_comment_author(); ?><br />
+			</div>
+
+			<abbr class="comment-time" title="<?php comment_date(__('l, F jS, Y, g:i a','comicpress')); ?>">
+				<?php printf(__('%1$s at %2$s','comicpress'), get_comment_date(), get_comment_time()); ?>
+			</abbr> 
+
+			<span class="separator">|</span> <a class="permalink" href="#comment-<?php echo str_replace('&', '&amp;', get_comment_ID()); ?>" title="<?php _e('Permalink to comment','comicpress'); ?>"><?php _e('Permalink','comicpress'); ?></a>
+
+			<?php
+				if((get_option('thread_comments')) && ($args['type'] == 'all' || get_comment_type() == 'comment')) :
+					$max_depth = get_option('thread_comments_depth');
+					echo comment_reply_link(array(
+						'reply_text' => __('Reply','comicpress'), 
+						'login_text' => __('Log in to reply.','comicpress'),
+						'depth' => $depth,
+						'max_depth' => $max_depth, 
+						'before' => '<span class="separator">|</span> <span class="comment-reply-link">', 
+						'after' => '</span>'
+					));
+				endif;
+			?>
+
+			<?php edit_comment_link('<span class="edit">'.__('Edit','comicpress').'</span>',' <span class="separator">|</span> ',''); ?> 
+
+			<?php if($comment->comment_approved == '0') : ?>
+				<em><?php _e('<span style=\"color:#ff0000;\">Your comment is awaiting moderation.</span>','comicpress'); ?></em>
+			<?php endif; ?>
+
+		</div>
+		<br class="clearfloat" />
+		<div class="comment-text">
+			<?php comment_text(); ?>
+		</div>
+<?php
+}
+
+/**
+* Ends the display of individual comments
+* Uses the callback parameter for wp_list_comments
+* Needs to be used in conjunction with comicpress_comments_callback
+* Not needed but used just in case something is changed
+*
+* @since 0.2.3
+*/
+function comicpress_comments_end_callback() {
+	echo '</li>';
+}
+
+/**
+* Sets a class for each comment
+* Sets alt, odd/even, and author/user classes
+* Adds author, user, and reader classes
+*
+* @since 0.2
+*/
+function comicpress_comment_class() {
+	global $comment;
+	static $comment_alt;
+	$classes = array();
+
+	if(function_exists('get_comment_class'))
+		$classes = get_comment_class();
+
+	$classes[] = get_comment_type();;
+
+	/*
+	* User classes
+	*/
+	if($comment->user_id > 0 && $user = get_userdata($comment->user_id)) :
+
+		$classes[] = 'user user-' . $user->user_nicename;
+
+		if($post = get_post($post_id)) :
+			if($comment->user_id === $post->post_author)
+				$classes[] = 'author author-' . $user->user_nicename;
+		endif;
+	else :
+		$classes[] = 'reader';
+	endif;
+
+	/*
+	* Alt classes
+	*/
+	if($comment_alt++ % 2) :
+		$classes[] = 'even';
+		$classes[] = 'alt';
+	else :
+		$classes[] = 'odd';
+	endif;
+
+	/*
+	* http://microid.org
+	*/
+	$email = get_comment_author_email();
+	$url = get_comment_author_url();
+	if(!empty($email) && !empty($url)) {
+		$microid = 'microid-mailto+http:sha1:' . sha1(sha1('mailto:'.$email).sha1($url));
+		$classes[] = $microid;
+	}
+
+
+	$classes = join(' ', $classes);
+
+	echo $classes;
+}
+
+/**
+* Properly displays comment author name/link
+* bbPress and other external systems sometimes don't set a display name for registrations
+* WP has problems if no display name is set
+* WP gives registered users URL of 'http://' if none is set
+*
+* @since 0.2.2
+*/
+function comicpress_comment_author() {
+	global $comment;
+
+	$author = get_comment_author();
+	$url = get_comment_author_url();
+
+	/*
+	* Registered members w/o URL defaults to 'http://'
+	*/
+	if($url == 'http://')
+		$url = false;
+
+	/*
+	* Registered through bbPress sometimes leaves no display name
+	* Bug with bbPress 0.9 series and WP 2.5 (no later testing)
+	* 'Anonymous' should be localized according to WP, not the theme
+	*/
+	if($comment->user_id > 0) :
+		$user = get_userdata($comment->user_id);
+		if($user->display_name)
+			$author = $user->display_name;
+		elseif($user->user_nickname)
+			$author = $user->nickname;
+		elseif($user->user_nicename)
+			$author = $user->user_nicename;
+		else
+			$author = $user->user_login;
+	endif;
+
+	/*
+	* Display link and cite if URL is set
+	* Also properly cites trackbacks/pingbacks
+	*/
+	if($url) :
+		$output = '<cite title="' . $url . '">';
+		$output .= '<a href="' . $url . '" title="' . wp_specialchars($author, 1) . '" class="external nofollow">' . $author . '</a>';
+		$output .= '</cite>';
+	else :
+		$output = '<cite>';
+		$output .= $author;
+		$output .= '</cite>';
+	endif;
+
+	echo $output;
+}
+
+?>

comments.php

@@ -1,93 +1,97 @@
-<div id="content" class="narrowcolumn">
-  <div class="comment-wrap">
+<div class="comment-wrap">
 
-  <?php
-    if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
+<?php
+if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
   die ('Please do not load this page directly. Thanks!');
 
-    if ( post_password_required() ) { ?>
+if ( post_password_required() ) { ?>
 	<p class="nocomments">This post is password protected. Enter the password to view comments.</p>
-    <?php
+<?php
   return;
-    }
+}
 
-    if ( have_comments() ) : ?>
+if ( have_comments() ) : ?>
 
 	<h3 id="comments"><?php comments_number('Discussion&not;', 'Discussion&not;', 'Discussion (%)&not;' );?></h3>
 
 	<ol class="commentlist">
-    <?php wp_list_comments(array('avatar_size'=>64)); ?>
+		<?php wp_list_comments(array(
+					'type' => 'all',
+					'callback' => 'comicpress_comments_callback',
+					'end-callback' => 'comicpress_comments_end_callback',
+					'avatar_size'=>64
+					)
+				); ?>	
 	</ol>
 	<div class="pagenav">
 		<div class="pagenav-right"><?php next_comments_link('Newer Comments &uarr;') ?></div>
 		<div class="pagenav-left"><?php previous_comments_link('&darr; Previous Comments') ?></div>
 		<div class="clear"></div>
 	</div>
-   <?php else : // this is displayed if there are no comments so far ?>
+<?php else : // this is displayed if there are no comments so far ?>
 
-    <?php if ('open' == $post->comment_status) : ?>
+<?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 endif; ?>
+<?php endif; ?>
 
 
-  <?php if ('open' == $post->comment_status) : ?>
+<?php if ('open' == $post->comment_status) : ?>
 
-  <div id="respond">
+<div id="respond">
 
-  <h3><?php comment_form_title( 'Comment&not;', 'Reply to %s&not;' ); ?></h3>
+<h3><?php comment_form_title( 'Comment&not;', 'Reply to %s&not;' ); ?></h3>
+
+<div class="cancel-comment-reply">
+<small><?php cancel_comment_reply_link(); ?></small>
+</div>
+
+<?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 echo urlencode(get_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 wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &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 &mdash; <a href="http://gravatar.com">Get an avatar</a></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>EMAIL <?php if ($req) echo "&mdash; Required / not published"; ?> </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: <code><?php echo allowed_tags(); ?></code></small></p>-->
+
+<p><textarea name="comment" id="comment" cols="50" rows="5" tabindex="4"></textarea></p>
+
+<p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
+<?php comment_id_fields(); ?>
+</p>
+
+<div class="clear"></div>
+
+<?php do_action('comment_form', $post->ID); ?>
+
+</form>
+
+<?php endif; // If registration required and not logged in ?>
+</div>
+
+<?php endif; ?>
 
-  <div class="cancel-comment-reply">
-    <small><?php cancel_comment_reply_link(); ?></small>
-  </div>
-
-  <?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 echo urlencode(get_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 wp_logout_url(get_permalink()); ?>" title="Log out of this account">Log out &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 &mdash; <a href="http://gravatar.com">Get an avatar</a></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>EMAIL <?php if ($req) echo "&mdash; Required / not published"; ?> </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: <code><?php echo allowed_tags(); ?></code></small></p>-->
-
-  <p><textarea name="comment" id="comment" cols="50" rows="5" tabindex="4"></textarea></p>
-
-  <p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
-  <?php comment_id_fields(); ?>
-  </p>
-
-  <div class="clear"></div>
-
-  <?php do_action('comment_form', $post->ID); ?>
-
-  </form>
-
-  <?php endif; // If registration required and not logged in ?>
-  </div>
-
-  <?php endif; ?>
-
-  </div>
 </div>

custom-image-header.php

@@ -0,0 +1,67 @@
+<?php 
+
+// Custom Image Header
+define('HEADER_TEXTCOLOR', '000');
+define('HEADER_IMAGE', '%s/images/header-blank.png'); // %s is theme dir uri
+define('HEADER_IMAGE_WIDTH', 760);
+define('HEADER_IMAGE_HEIGHT', 140);
+
+function theme_admin_header_style() {
+?>
+<style type="text/css">
+#headimg {
+	width: <?php echo HEADER_IMAGE_WIDTH; ?>px;
+	height: <?php echo HEADER_IMAGE_HEIGHT; ?>px;
+	background: url(<?php header_image(); ?>) no-repeat center;	
+}
+
+#headimg h1, #headimg .description 
+{
+	text-decoration: none;
+<?php	
+	if ( 'blank' == get_header_textcolor() ) { ?>
+		display: none;
+	<?php } else {
+		//  Otherwise, set the color to be the user selected one
+	?>
+		color: #<?php header_textcolor();?>;
+	<?php } ?>	
+}
+</style>
+<?php
+}
+
+function theme_header_style() {
+?>
+<style type="text/css">
+#header
+{
+	width: <?php echo HEADER_IMAGE_WIDTH; ?>px;
+	height: <?php echo HEADER_IMAGE_HEIGHT; ?>px;
+	background: url(<?php header_image(); ?>) no-repeat center;
+}
+
+<?php
+//  Has the text been hidden?
+//  If so, set display to equal none
+	if ( 'blank' == get_header_textcolor() ) { ?>
+		#header h1, #header .description {
+			display: none;
+		}	
+	<?php } else {
+		//  Otherwise, set the color to be the user selected one
+	?>
+		#header *
+		{
+			color: #<?php header_textcolor();?>;
+		}
+	}
+	<?php } ?>
+</style>
+<?php
+}
+if ( function_exists('add_custom_image_header') ) {
+	add_custom_image_header('theme_header_style', 'theme_admin_header_style');
+} 
+
+?>

footer.php

@@ -1,9 +1,13 @@
 <div class="clear"></div><!-- Clears floated columns and sidebars -->
 
 <div id="footer">
+	<center>
+		<?php if (function_exists('the_project_wonderful_ad')) { the_project_wonderful_ad('footer'); } ?>
+	</center>
 	<p>
 		<?php bloginfo('name') ?> is powered by <a href="http://wordpress.org/">WordPress</a> with <a href="http://comicpress.org/">ComicPress</a>
-		| Subscribe: <a href="<?php bloginfo('rss2_url') ?>">RSS Feed</a>
+		| Subscribe: <a href="<?php bloginfo('rss2_url') ?>">RSS Feed</a> | <a href="#outside" onclick="scrollup(); return false;">Return to Top &nbsp;</a><br />
+		<a href="http://english-156752579142.spampoison.com"><img src="http://pics4.inxhost.com/images/sticker.gif" border="0" width="80" height="15"/></a>
 		<!-- <?php echo get_num_queries() ?> queries. <?php timer_stop(1) ?> seconds. -->
 	</p>
 </div>

functions.php

@@ -1,6 +1,14 @@
 <?php
 
-include(TEMPLATEPATH . '/comicpress-config.php');
+if (file_exists(get_template_directory().'/wpmu-functions.php')) {
+	include(get_template_directory() . '/wpmu-functions.php');
+} else {
+	include(get_template_directory() . '/comicpress-config.php');
+}
+include(get_template_directory() . '/comment-functions.php');
+include(get_template_directory() . '/custom-image-header.php');
+include(get_template_directory() . '/comic-navigation-functions.php');
+include(get_template_directory() . '/buystrip-functions.php');
 
 // If any errors occur while searching for a comic file, the error messages will be pushed into here.
 $comic_pathfinding_errors = array();
@@ -137,7 +145,8 @@ function get_terminal_post_in_category($categoryID, $first = true) {
 * @param string $filter The $comic_filename_filters to use.
 * @return string The relative path to the comic file, or false if not found.
 */
-function get_comic_path($folder = 'comic', $override_post = null, $filter = 'default') {
+if (!function_exists('get_comic_path')) {
+	function get_comic_path($folder = 'comic', $override_post = null, $filter = 'default') {
 	global $post, $comic_filename_filters, $comic_folder, $archive_comic_folder, $rss_comic_folder, $comic_pathfinding_errors;
 
 	if (isset($comic_filename_filters[$filter])) {
@@ -163,6 +172,7 @@ function get_comic_path($folder = 'comic', $override_post = null, $filter = 'def
 
 	$comic_pathfinding_errors[] = sprintf(__("Unable to find the file in the <strong>%s</strong> folder that matched the pattern <strong>%s</strong>. Check your WordPress and ComicPress settings.", 'comicpress'), $folder, $filter_with_date);
 	return false;
+	}
 }
 
 /**
@@ -484,12 +494,12 @@ function widget_comicpress_comic_bookmark() { ?>
 				/* Bookmark Config Settings */
 
 				var cl = 31;
-				var imgTag = '<?php bloginfo('template_directory'); ?>/1.gif';		//add tag image.
-				var imgClearOff = '<?php bloginfo('template_directory'); ?>/3a.gif';	//no comic tagged, clear not possible
-				var imgGotoOff = '<?php bloginfo('template_directory'); ?>/2a.gif';	//no comic tagged, goto not possible
-				var imgClearOn = '<?php bloginfo('template_directory'); ?>/3.gif';	//clear a tag, shows when comic previously tagged
-				var imgGotoOn = '<?php bloginfo('template_directory'); ?>/2.gif';	//shows when a comic is tagged  
-				var imgInfo = '<?php bloginfo('template_directory'); ?>/4.gif';  	//img that displays the help
+				var imgTag = '<?php bloginfo('template_directory'); ?>/images/1.gif';		//add tag image.
+				var imgClearOff = '<?php bloginfo('template_directory'); ?>/images/3a.gif';	//no comic tagged, clear not possible
+				var imgGotoOff = '<?php bloginfo('template_directory'); ?>/images/2a.gif';	//no comic tagged, goto not possible
+				var imgClearOn = '<?php bloginfo('template_directory'); ?>/images/3.gif';	//clear a tag, shows when comic previously tagged
+				var imgGotoOn = '<?php bloginfo('template_directory'); ?>/images/2.gif';	//shows when a comic is tagged  
+				var imgInfo = '<?php bloginfo('template_directory'); ?>/images/4.gif';  	//img that displays the help
 				var comicDir = '/'; 		//alter this if you run multiple comics in different directories on your site.
 
 				/* Now write out the applicable links */

header.php

@@ -21,15 +21,20 @@
 	<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name') ?> RSS Feed" href="<?php bloginfo('rss2_url') ?>" />
 	<link rel="alternate" type="application/atom+xml" title="<?php bloginfo('name') ?> Atom Feed" href="<?php bloginfo('atom_url') ?>" />
 	<link rel="pingback" href="<?php bloginfo('pingback_url') ?>" />
+	<script type="text/javascript" src="<?php bloginfo('stylesheet_directory'); ?>/js/scroll.js"></script>
+	<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
 	<?php wp_head() ?>
-	<!--[if lt IE 7]><script type="text/javascript" src="<?php bloginfo('template_directory') ?>/ie6submenus.js"></script><![endif]-->
+	<!--[if lt IE 7]><script type="text/javascript" src="<?php bloginfo('template_directory') ?>/js/ie6submenus.js"></script><![endif]-->
 </head>
 
-<body>
+<body <?php if (function_exists('body_class')) { body_class(); } ?>>
 
 <div id="page"><!-- Defines entire site width - Ends in Footer -->
 
 <div id="header">
+	<div class="headerad">
+		<?php if (function_exists('the_project_wonderful_ad')) { the_project_wonderful_ad('header'); } ?>
+	</div>
 	<h1><a href="<?php echo get_settings('home') ?>"><?php bloginfo('name') ?></a></h1>
 	<div class="description"><?php bloginfo('description') ?></div>
 </div>
@@ -51,9 +56,9 @@
 	</div>
 
 	<ul id="menu">
-		<li><a href="<?php bloginfo('url') ?>">Home</a></li>
+		<li <?php if (is_home()) { ?> class="current_page_item"<?php } ?>><a href="<?php bloginfo('url'); ?>">Home</a></li>
 		<?php wp_list_pages('sort_column=menu_order&depth=4&title_li=') ?>
-		<li><a href="<?php bloginfo('rss2_url') ?>">Subscribe</a></li>
+		<li><a href="<?php bloginfo('rss2_url'); ?>"><img src="<?php bloginfo('stylesheet_directory'); ?>/images/data_rss.gif" class="rss" alt="RSS" /></a></li>
 	</ul>
 
 	<div class="clear"></div>

image.php

@@ -64,6 +64,6 @@
 
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

index.php

@@ -9,6 +9,8 @@
 			<img src="<?php the_comic() ?>" alt="<?php the_title() ?>" title="<?php the_hovertext() ?>" />
 		</div>
 		<div id="comic-foot"></div>
+		<?php // if (function_exists('buy_this_comic')) { buy_this_comic(); } ?>		
+		<?php // if (function_exists('comic_navigation')) { comic_navigation(); } ?>
 	<?php endwhile; ?>
 
 	<div id="content" class="narrowcolumn">
@@ -20,22 +22,23 @@
 					<div class="nav-first"><a href="<?php echo $first_comic ?>" title="Go to the First Comic">&lsaquo;&lsaquo; First</a></div>
 					<div class="nav-previous"><?php global $wp_query; $wp_query->is_single = true; previous_comic_link('%link', '&lsaquo; Previous'); $wp_query->is_single = false ?></div>
 				</div>
-				<div class="comicdate">
-					<?php the_time('F jS, Y') ?>
-				</div>
 				<div class="clear"></div>
 				<?php if (get_option('comicpress-enable-storyline-support') == 1) { ?>
 					<ul class="storyline-cats"><li class="storyline-root"><?php the_category(' &raquo; </li><li>', multiple) ?></li></ul>
 				<?php } ?>
-				<h2>
-					<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title() ?>"><?php the_title() ?></a>
-				</h2>
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y'); ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?> <br />
+				Posted in: <?php the_category(','); ?>
+				<?php if(function_exists('the_ratings')) { the_ratings(); } ?> 
 				<div class="entry">
 					<?php the_content('&darr; Read the rest of this entry...') ?>
 				</div>
 				<?php the_transcript('styled') ?>
 				<div class="tags">
-					<?php the_tags('&#9492; Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?> 
+					<?php the_tags('&#9492; Tags: ', ', ', ''); ?> 
 				</div>
 				<div class="comment-link">
 					<?php if ('open' == $post->comment_status) { comments_popup_link('&ldquo;Comment&rdquo;', '&ldquo;1 Comment&rdquo;', '&ldquo;% Comments&rdquo;'); } ?>
@@ -57,17 +60,18 @@
  while ($wp_query->have_posts()) : $wp_query->the_post() ?>
 		<div class="post-head"></div>
 		<div class="post" id="post-<?php the_ID() ?>">
-			<h3>
-				<a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title() ?>"><?php the_title() ?></a>
-			</h3>
-			<div class="postdate">
-				<?php the_time('F jS, Y') ?>
+			<div class="comicdate">
+				<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
 			</div>
+			<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+			By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?> <br />
+			Posted in: <?php the_category(','); ?>
+			<?php if(function_exists('the_ratings')) { the_ratings(); } ?> 
 			<div class="entry">
 				<?php the_content('&darr; Read the rest of this entry...') ?>
 			</div> 
 			<div class="tags">
-				<?php the_tags('&#9492; Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?>
+				<?php the_tags('&#9492; Tags: ', ', ', ''); ?>
 			</div>
 			<div class="comment-link">
 				<?php if ('open' == $post->comment_status) { comments_popup_link('&ldquo;Comment&rdquo;', '&ldquo;1 Comment&rdquo;', '&ldquo;% Comments&rdquo;'); } ?>
@@ -76,15 +80,18 @@
 		</div>
 		<div class="post-foot"></div>
 	<?php endwhile; ?>
+
+  <?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
     <div class="pagenav">
       <div class="pagenav-right"><?php previous_posts_link('Newer Entries &uarr;') ?></div>
       <div class="pagenav-left"><?php next_posts_link('&darr; Previous Entries') ?></div>
       <div class="clear"></div>
     </div>	
+  <?php } ?>
 	<?php $wp_query = null; $wp_query = $temp ?>
 
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

js/ie6submenus.js

@@ -0,0 +1,14 @@
+//Suckerfish Dropdown for IE6
+
+sfHover = function() {
+var sfEls = document.getElementById("menu").getElementsByTagName("LI");
+for (var i=0; i<sfEls.length; i++) {
+sfEls[i].onmouseover=function() {
+this.className+=" sfhover";
+}
+sfEls[i].onmouseout=function() {
+this.className=this.className.replace(new RegExp(" sfhover\\b"), "");
+}
+}
+}
+if (window.attachEvent) window.attachEvent("onload", sfHover);

js/scroll.js

@@ -0,0 +1,28 @@
+// JavaScript Document
+
+var up_timer
+
+function getPosition(){
+	yoko = document.body.scrollLeft || document.documentElement.scrollLeft;
+	tate = document.body.scrollTop  || document.documentElement.scrollTop;
+
+}
+
+function pageup(x,y){
+	if(up_timer) clearTimeout(up_timer);
+	if(y >= 1){
+		getPosition();
+		var divisionY = (tate-(tate/5));
+		var Y = Math.floor(divisionY);
+		window.scrollTo(yoko,Y);
+		up_timer = setTimeout("pageup("+yoko+","+Y+")",2);
+	}else{
+		window.scrollTo(yoko,0);
+		clearTimeout(up_timer);
+	}
+}
+
+function scrollup(){
+		getPosition();
+		pageup(yoko,tate)
+}

links.php

@@ -20,6 +20,6 @@ Template Name: Links
   </div>
 </div>
 	
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

page.php

@@ -17,6 +17,6 @@
   <?php comments_template(); ?>
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

search-transcript.php

@@ -1,6 +1,6 @@
 <?php get_header() ?>
 
-<div id="content" class="archive">
+<div id="content" class="narrowcolumn">
 
   <div class="post-page-head"></div>
   <div class="post-page">			
@@ -22,10 +22,14 @@
 
           <div class="post-comic-head"></div>
           <div class="post-comic">
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('[edit this]'); ?> <br />
+				Posted in: <?php the_category(','); ?>		
             <div class="comicarchiveframe" style="width:<?php echo $archive_comic_width ?>px;">
 				<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="<?php the_title() ?>" title="<?php the_transcript() ?>" width="<?php echo $archive_comic_width ?>" /><br />
-              <h3><?php the_title() ?></h3>
-              <small><?php the_time('F jS, Y') ?></small></a>
             </div>
             <br class="clear-margins" />
           </div>
@@ -35,8 +39,12 @@
 
           <div class="post-head"></div>
           <div class="post">
-            <h3><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title() ?>"><?php the_title() ?></a></h3>
-            <div class="postdate"><?php the_time('F jS, Y') ?></div>
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('[edit this]'); ?> <br />
+				Posted in: <?php the_category(','); ?>		
             <?php the_excerpt() ?>
             <br class="clear-margins" />
           </div>
@@ -46,11 +54,13 @@
 
     <?php endwhile; ?>
 
+    <?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
       <div class="pagenav">
         <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
         <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
         <div class="clear"></div>
       </div>
+    <?php } ?>
 
   <?php else : ?>
 
@@ -67,6 +77,6 @@
 
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

search.php

@@ -1,6 +1,6 @@
 <?php get_header() ?>
 
-<div id="content" class="archive">
+<div id="content" class="narrowcolumn">
 
   <div class="post-page-head"></div>
   <div class="post-page">			
@@ -22,10 +22,14 @@
 
           <div class="post-comic-head"></div>
           <div class="post-comic">
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('[edit this]'); ?> <br />
+				Posted in: <?php the_category(','); ?>		
             <div class="comicarchiveframe" style="width:<?php echo $archive_comic_width ?>px;">
               <a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" alt="Click for full size." title="Click for full size" width="<?php echo $archive_comic_width ?>" /><br />
-              <h3><?php the_title() ?></h3>
-              <small><?php the_time('F jS, Y') ?></small></a>
             </div>
             <br class="clear-margins" />					
           </div>
@@ -35,8 +39,12 @@
 
           <div class="post-head"></div>
           <div class="post">
-            <h3><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title() ?>"><?php the_title() ?></a></h3>
-            <div class="postdate"><?php the_time('F jS, Y') ?></div>
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><a href="<?php the_permalink(); ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('[edit this]'); ?> <br />
+				Posted in: <?php the_category(','); ?>
 				<?php the_excerpt() ?>
 				<br class="clear-margins" />
 		</div>
@@ -44,13 +52,15 @@
           
         <?php } ?>
       
-    <?php endwhile ?>
+    <?php endwhile; ?>
     
+    <?php if(function_exists('wp_page_numbers')) { wp_page_numbers(); } else { ?>
       <div class="pagenav">
         <div class="pagenav-right"><?php next_posts_link('Next Page &rsaquo;') ?></div>
         <div class="pagenav-left"><?php previous_posts_link('&lsaquo; Previous Page') ?></div>
         <div class="clear"></div>
       </div>
+    <?php } ?>
     
   <?php else : ?>
 
@@ -63,10 +73,10 @@
     </div>
     <div class="post-page-foot"></div>
 
-  <?php endif ?>
+  <?php endif; ?>
 
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

searchform.php

@@ -1,6 +1,6 @@
 <form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
 	<div>
 		<input type="text" value="Search Site..." name="s" id="s" onfocus="this.value=(this.value=='Search Site...') ? '' : this.value;" onblur="this.value=(this.value=='') ? 'Search Site...' : this.value;" />
-		<input type="submit" id="searchsubmit" value="&raquo;" />
+		<button type="submit" class="button">&#9658;</button>
 	</div>
 </form>

sidebar.php

@@ -1,4 +1,4 @@
-<div id="sidebar">
+<div id="sidebar" class="sidebar-single">
 
 	<ul>
 

single.php

@@ -6,6 +6,8 @@
 		<img src="<?php the_comic() ?>" alt="<?php the_title() ?>" title="<?php the_hovertext() ?>" />
 	</div>
 	<div id="comic-foot"></div>
+	<?php // if (function_exists('buy_this_comic')) { buy_this_comic(); } ?>		
+	<?php // if (function_exists('comic_navigation')) { comic_navigation(); } ?>
 <?php } endwhile; ?>
 
 <div id="content" class="narrowcolumn">
@@ -15,24 +17,28 @@
 		<?php if (in_comic_category()) { ?>
 			<div class="post-comic-head"></div>
 			<div class="post-comic" id="post-<?php the_ID() ?>">
-				<div class="comicdate">
 				<div class="nav">
 					<?php if ( get_permalink() != $first_comic ) { ?><div class="nav-first"><a href="<?php echo $first_comic ?>">&lsaquo;&lsaquo; First</a></div><?php } ?>
 					<div class="nav-previous"><?php previous_comic_link('%link', '&lsaquo; Previous') ?></div>
 					<div class="nav-next"><?php next_comic_link('%link', 'Next &rsaquo;') ?></div>
 					<?php if ( get_permalink() != $last_comic ) { ?><div class="nav-last"><a href="<?php echo $last_comic ?>">Last &rsaquo;&rsaquo;</a></div><?php } ?>
 				</div>
-					<?php the_time('F jS, Y') ?>
-				</div>
+				<div class="clear"></div>
 				<?php if (get_option('comicpress-enable-storyline-support') == 1) { ?>
 					<ul class="storyline-cats"><li class="storyline-root"><?php the_category(' &raquo; </li><li>', 'multiple') ?></li></ul>
 				<?php } ?>
-				<h2><?php the_title() ?></h2>
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><?php the_title(); ?></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('Edit Post', ' [ ', ' ] ') ?> <br />
+				Posted in: <?php the_category(','); ?>
+				<?php if(function_exists('the_ratings')) { the_ratings(); } ?> 
 				<div class="entry">
 					<?php the_content() ?>
 					<?php the_transcript('styled') ?>			
 					<div class="tags">
-						<?php the_tags('&#9492; Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?> 
+						<?php the_tags('&#9492; Tags: ', ', ', '');  ?> 
 					</div>
 					<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
 				</div>
@@ -49,13 +55,18 @@
 					<div class="nav-blog-next"><?php next_post_link('%link','Next &rsaquo;', TRUE) ?></div>
 				</div>
 				<div class="clear"></div>
-				<h2><?php the_title() ?></h2>
-				<div class="postdate"><?php the_time('F jS, Y') ?></div>
+				<div class="comicdate">
+					<div class="date"><span><?php the_time('M') ?></span> <?php the_time('d') ?></div>
+				</div>
+				<h2><?php the_title(); ?></h2>
+				By <?php the_author(); ?> on <?php the_time('F jS, Y') ?> <?php edit_post_link('Edit Post', ' [ ', ' ] '); ?> <br />
+				Posted in: <?php the_category(','); ?>
+				<?php if(function_exists('the_ratings')) { the_ratings(); } ?> 
 				<div class="entry">
 					<?php the_content() ?>
 					<?php the_transcript('styled') ?>			
 					<div class="tags">
-						<?php the_tags('&#9492; Tags: ', ', ', ''); edit_post_link('Edit Post', ' [ ', ' ] ') ?> 
+						<?php the_tags('&#9492; Tags: ', ', ', ''); ?> 
 					</div>
 					<?php wp_link_pages(array('before' => '<p><strong>Pages:</strong> ', 'after' => '</p>', 'next_or_number' => 'number')) ?>
 				</div>
@@ -80,6 +91,6 @@
 	
 </div>
 
-<?php include(TEMPLATEPATH . '/sidebar.php') ?>
+<?php get_sidebar(); ?>
 
 <?php get_footer() ?>

style.css

@@ -1,18 +1,16 @@
-	/*
+/*
 Theme Name: ComicPress
 Theme URI: http://comicpress.org
 Description: Publish a comic with WordPress. Standard Edition. <a href="http://comicpress.org">Visit the ComicPress Website.</a>
-Author: Tyler Martin
+Author: Tyler Martin, John Bintz, Philip M. Hofer (Frumph)
 Author URI: http://mindfaucet.com/
-Version: 2.7.1
+Version: 2.8
 .
 The CSS, XHTML and design is released under GPL v3:
 http://www.opensource.org/licenses/gpl-3.0.html
 .
 */
 
-
-
 /* STANDARD TAGS */
 
 body {
@@ -170,13 +168,20 @@ h3, h3 a, h3 a:hover {
 		letter-spacing: 2px;
 		}
 
-
+	.headerad 
+	{
+		float: right;
+		height: 70px;
+		width: 470px;
+		margin: 5px 5px 0 0;
+	}
 
 /* THE MENU */
 
 #menubar {
-	background: #000;
 	zoom: 1; /* IE fix, allows for variable height menu  */
+	background: #000 url('images/menubarbgdark.jpg') repeat-x;
+	border: 1px solid #050505;
 	}
 
 #menunav {
@@ -191,9 +196,10 @@ h3, h3 a, h3 a:hover {
 		color: #fff;
 		font-size: 19px;
 		font-weight: bold;
-		line-height: 25px;
+		line-height: 22px;
 		text-align: center;
-		border-left: 1px solid #fff;
+		border-left: 1px solid #353535;
+		border-right: 1px solid #454545;
 		}
 
 		#menunav a:hover {
@@ -211,13 +217,19 @@ h3, h3 a, h3 a:hover {
     }
 
 	#menu a {
-		padding: 0px 5px;
+		padding: 0px 10px 0 10px;
 		display: block;
 		color: #fff;
 		text-decoration: none;
-		border-right: 1px solid #fff;
+		border-left: 1px solid #353535;
+		border-right: 1px solid #454545;
 		}
 
+	#menu li .rss {
+		padding: 5px 0 5px 0; 
+	}
+	
+
 	#menu li {
 		float: left;
 		}
@@ -240,13 +252,13 @@ h3, h3 a, h3 a:hover {
 		left: -9999px;
 		width: 151px;
 		line-height: 1;
-		border-top: 1px solid #fff;
+		border-top: 1px solid #353535;
 		}
 	#menu li li {
 		width: 150px;
 		margin: 0 0 0 -1px;
 		border-width: 0 1px 1px 1px;
-		border-color: #fff;
+		border-color: #454545;
 		border-style: solid;
 		}
 	#menu li li a {
@@ -272,10 +284,14 @@ h3, h3 a, h3 a:hover {
 	    }
 	#menu li:hover ul, #menu li li:hover ul, #menu li li li:hover ul, #menu li li li li:hover ul, #menu li.sfhover ul, #menu li li.sfhover ul, #menu li li li.sfhover ul, #menu li li li li.sfhover ul {
 	    left: auto;
-	    background: #222; /*Submenu background color */
+		background: #646464;	    
+	    /* background: #222; Submenu background color */
 		text-transform: none;
 	    }
 	    
+	#menu .current_page_item a {
+		color: #fff000;
+	}
 
 
 /* THE COMIC */
@@ -382,13 +398,12 @@ h3, h3 a, h3 a:hover {
 	overflow: hidden;
 	}
 
-.narrowcolumn
-{
-  width: 560px;
+.narrowcolumn {
+  width: 558px;
+  /* width: 356px; -- 3c gn etc 3 column */
   }
 
-.widecolumn
-{
+.widecolumn {
   width: 760px;
   }
 
@@ -405,6 +420,49 @@ h3, h3 a, h3 a:hover {
 	overflow: hidden;
 	}
 	
+	.comicdate {
+		color: #777;
+		font-family: 'Georgia' , serif;
+		font-size: 15px;
+		font-weight: bold;
+	}
+	
+	.comicdate .date {
+		height: 50px;
+		width: 45px;
+		background: url(images/calendar.png) no-repeat;
+		font: normal 22px Verdana, Arial, Helvetica, sans-serif;
+		color: #666666;
+		text-align: center;
+		padding: 0px 2px 0 0;
+		line-height: 100%;
+		float: left;
+		margin: 0 2px 0 4px;
+		}
+
+	.comicdate .date span {
+		height: 16px;
+		display: block;
+		font: normal 11px Verdana, Arial, Helvetica, sans-serif;
+		color: #ffffff;
+		text-align: center;
+		padding-top: 5px;
+	}
+	
+	.post h2, .post h2 a, .post-comic h2, .post-comic h2 a  {
+		display: block;
+		height: 24px;
+		background: #eee;
+		border: solid 1px #cdcdcd;
+		font-size: 20px;
+		padding-left: 5px;
+		clear: none;
+	}
+	
+	.post h2 a:hover, .post-comic h2 a:hover, .post-page h2 a:hover {
+		color: #ff0000;
+	}
+	
 	.comicdate {
 		font-size: 14px;
 		}
@@ -472,6 +530,10 @@ h3, h3 a, h3 a:hover {
 		border: 1px dotted #000;
 	}
 	
+	.bypostauthor {
+		background: #fffbdc;
+	}
+
 .comment-author {
 	display: inline;
 	}
@@ -542,6 +604,7 @@ ul.children {
 	background: #fff;
 	opacity: 0.99;
 	filter: alpha(opacity=99);
+	margin: 0 auto;
 	}
  
 	.comicarchiveframe:hover {
@@ -572,13 +635,27 @@ ul.children {
 /* SIDEBAR */
 
 #sidebar {
-	width: 200px;
 	padding: 5px 0;
 	float: left;
 	font-size: 11px;
 	overflow: hidden;
 	}
 
+/* Left Sidebar Themes */
+.sidebar-left {
+	width: 200px;
+	}
+
+/* Right Sidebar Themes */
+.sidebar-right {
+	width: 200px;
+	}
+	
+/* Single Sidebar themes */
+.sidebar-single {
+	width: 200px;
+	}
+
 #sidebar h2, #sidebar h2 a {	
 	font-size: 16px;
 	}
@@ -897,3 +974,94 @@ li.pingback div p, li.trackback div p {
 	line-height: 0;
 	font-size: 0;
 	}
+	
+.button
+{
+	color: #000;
+	height: 22px;
+	width: 20px;
+	background: #c5c5c5;
+	border: 1px solid #000;
+	padding: 0 0 3px 0;
+	font-weight: 700;
+}
+
+/* COMIC NAVIGATION */
+
+a.rollnext
+{
+	display: inline-block;
+	height: 50px;
+	width: 125px;
+	float: right;
+	text-decoration: none;
+	background: url('images/nextroll.png') no-repeat;
+}
+
+a.rolllast
+{
+	display: inline-block;
+	height: 50px;
+	width: 125px;
+	float: right;
+	text-decoration: none;
+	background: url('images/lastroll.png') no-repeat;
+}
+
+a.rollprev
+{
+	display: inline-block;
+	height: 50px;
+	width: 125px;
+	float: left;
+	text-decoration: none;
+	background: url('images/prevroll.png') no-repeat;
+}
+
+a.rollfirst
+{
+	display: inline-block;
+	height: 50px;
+	width: 125px;
+	float: left;
+	text-decoration: none;
+	background: url('images/firstroll.png') no-repeat;
+}
+
+a.rollfirst:hover, a.rollprev:hover, a.rollnext:hover, a.rolllast:hover
+{
+	background-position: -125px 0;
+}
+
+#comic_navi_wrapper
+{
+	width: 100%;
+	height: 50px;
+}
+
+#comic_navi_prev
+{
+	width: 260px;
+	float: left;
+}
+
+#comic_navi_next
+{
+	width: 260px;
+	float: right;
+} 
+
+
+/** BUY THIS **/
+
+.buythis {
+	float: right;
+	margin-right: 100px;
+}
+
+.buythisbutton
+{
+	height: 28px;
+	width: 240px;
+	background: url('images/buythis.png') no-repeat;
+}