2.8.1.33

Signed-off-by: Philip M. Hofer (Frumph) <frumph_dragon@yahoo.com>

archive-comic-month.php

@@ -0,0 +1,47 @@
+<?php
+/*
+Template Name: Month at a glance
+*/
+?>
+<?php get_header();  ?>
+<?php include(get_template_directory() . '/layout-head.php'); ?>
+
+<div class="<?php comicpress_post_class(); ?>">
+	<div class="post-page-head"></div>
+	<div class="post-page">
+	<?php while (have_posts()) : the_post() ?>
+		<div class="entry">
+			<h2 class="pagetitle"><?php the_title() ?></h2>
+			<?php the_content(); ?>
+		</div>
+	<?php endwhile; ?>
+
+	<?php	
+//based on Austin Matzko's code from wp-hackers email list
+  function filter_where($where = '') {
+    //posts in the last 30 days
+	$where .= " AND post_date > '" . date('Y-m-d', strtotime('-30 days')) . "'";
+//    $where .= " AND post_date >= '2009-03-01' AND post_date < '2009-03-16'";
+    return $where;
+  }
+add_filter('posts_where', 'filter_where');
+$posts = query_posts('&show_posts=-1&posts_per_page=-1&cat='.get_all_comic_categories_as_cat_string());
+
+?>
+
+	<?php if (have_posts()) : while (have_posts()) : the_post() ?>
+				<div class="comicthumbwrap">
+					<div class="comicarchiveframe">
+						<a href="<?php the_permalink() ?>"><img src="<?php the_comic_mini() ?>" alt="<?php the_title() ?>" title="<?php the_title() ?>" style="width: <?php echo $mini_comic_width; ?>px" /></a><br />
+					</div>
+				</div>
+	<?php endwhile; endif; ?>
+		<br class="clear-margins" />
+	</div>
+	<div class="post-page-foot"></div>
+</div>
+	</div>
+</div>
+	
+<?php include(get_template_directory() . '/layout-foot.php'); ?>
+<?php get_footer() ?>

archive-comic-storyline-thumbs.php

@@ -47,7 +47,7 @@ Template Name: Comic Storyline with Thumbs
 						
 						<li id="storyline-<?php echo $category->category_nicename ?>"<?php echo $storyline_root; $storyline_root = null ?>>
 							<?php if (!empty($first_comic_in_category)) { ?>
-								<a href="<?php echo $first_comic_permalink ?>" title="<?php _e('First comic in','comicpress'); ?> <?php echo $category->cat_name ?>."><img src="<?php echo $archive_image ?>" /></a>
+								<a href="<?php echo $first_comic_permalink ?>" title="<?php _e('First comic in','comicpress'); ?> <?php echo $category->cat_name ?>."><img src="<?php echo $archive_image ?>" style="width: <?php echo $mini_comic_width; ?>px" /></a>
 							<?php } ?>
 							<a href="<?php echo get_category_link($category_id) ?>" class="storyline-title"><?php echo $category->cat_name ?></a>
 							<?php if (!empty($description)) { ?>

archive-comic-year.php

@@ -17,8 +17,6 @@ if (isset($_REQUEST['archive_year'])) {
 if (empty($archive_year) || $archive_year == '') $archive_year = date('Y');
 ?> 
 	
-
-	
 <div class="<?php comicpress_post_class(); ?>">
 	<div class="post-page-head"></div>
 	<div class="post-page">

archive.php

@@ -49,8 +49,8 @@
 			<?php if (is_category() && in_comic_category()) { ?>
 
 				<div class="comicthumbwrap">
-					<div class="comicarchiveframe">
+					<div class="comicarchiveframe" style="width: <?php echo $mini_comic_width; ?>px">
-						<a href="<?php the_permalink() ?>"><img src="<?php the_comic_mini() ?>" alt="<?php the_title() ?>" title="<?php the_title() ?>" /></a><br />
+						<a href="<?php the_permalink() ?>"><img src="<?php the_comic_mini() ?>" alt="<?php the_title() ?>" title="<?php the_title() ?>" /></a>
 					</div>
 				</div>
 
@@ -133,7 +133,7 @@
 				<?php } ?>
 			<?php } ?>
 		<?php endwhile; ?>
-
+		<div class="clear"></div>
 	<?php else : ?>
 	<div class="<?php comicpress_post_class(); ?>">
 		<div class="post-head"></div>

buystrip.php

@@ -28,8 +28,15 @@ Templete Author Email: philip@frumph.net
 			<?php _e('Title:','comicpress'); ?>	<?php echo the_title(); ?><br />
 			<br />
 			<?php $post = & get_post( $comicnum ); ?>
+				<?php
+				foreach (array("archive", "rss", "comic", "mini") as $type) {
+					if (($requested_image = get_comic_url($type, $post)) !== false) {
+						$image = $requested_image; break;
+					}
+				}
+			?>
 			<center>
-			<img src="<?php echo the_comic_archive(); ?>" alt="<?php the_title(); ?>" title="<?php the_title(); ?>" width="<?php echo $archive_comic_width; ?>" /><br />
+			<img src="<?php echo $image; ?>" alt="<?php the_title(); ?>" title="<?php the_title(); ?>" /><br />
 			<br />
 			<table>
 			<tr>

comicpress-config.php

@@ -25,7 +25,7 @@ $rss_comic_width = "600";
 $blog_postcount = "3";
 
 //Mini Comic Width - The width your comics will appear in minithumbs (default "100")
-$mini_comic_width = "100";
+$mini_comic_width = "80";
 
 //Minithumb Comic Folder - The folder for your your mini thumbs (default "comics-mini")
 $mini_comic_folder = "comics-mini";

comicpress-options-config.php

@@ -274,6 +274,11 @@ $options = array (
 			"default" => "no",
 			"type" => "comicpress-remove_wptexturize"),
 			
+		array(
+			"id" => "comicpress-disable_default_menubar",
+			"default" => "no",
+			"type" => "comicpress-disable_default_menubar"),
+			
 		array("type" => "close")
 		);
 ?>

comments.php

@@ -8,6 +8,7 @@ if ( post_password_required() ) { ?>
 	return;
 } ?>
 
+<div id="comment-wrapper-head"></div>
 <div id="comment-wrapper">
 
 <?php if ( have_comments() ) : ?>
@@ -121,7 +122,7 @@ if ( post_password_required() ) { ?>
 				<?php endif; ?>
 				<?php do_action('comment_form', $post->ID); ?>
 				<p><textarea name="comment" id="comment" cols="50" rows="6" tabindex="4"></textarea></p>
-				<button type="submit" class="button"><?php _e('Submit Comment','comicpress'); ?></button>
+				<button type="submit"><?php _e('Submit Comment','comicpress'); ?></button>
 				<?php global $disable_comment_note;
 				if ($disable_comment_note != 'yes') { ?>
 					<div class="comment-note"><?php _e('NOTE - You can use these tags:','comicpress'); ?><br /><?php echo allowed_tags(); ?></div>
@@ -133,3 +134,4 @@ if ( post_password_required() ) { ?>
 
 <?php endif; ?>
 </div>
+<div id="comment-wrapper-foot"></div>

footer.php

@@ -1,4 +1,4 @@
-<?php if (comicpress_check_themepack_file('footer.php') == false) { ?>
+<?php if (comicpress_check_themepack_file('footer') == false) { ?>
 <div id="footer">
 	<?php if (function_exists('the_project_wonderful_ad')) { ?>
 		<div class="footerpwad">
@@ -8,9 +8,9 @@
 		</div>
 	<?php } ?>
 	<?php get_sidebar('footer'); ?>
-	<?php global $disable_footer_text; if ($disable_footer_text != 'yes') { ?>
+	<?php global $disable_footer_text, $wpmu_version; if ($disable_footer_text != 'yes') { ?>
 		<p>
-			<span class="footer-copyright"><?php echo cp_copyright(); ?> <?php echo the_author_meta('firstname',1); echo "&nbsp;"; echo the_author_meta('lastname',1); ?><span class="footer-pipe"> | </span></span>
+			<span class="footer-copyright"><?php echo cp_copyright(); ?> <?php if (empty($wpmu_version)) { ?><?php echo the_author_meta('firstname',1); echo "&nbsp;"; echo the_author_meta('lastname',1); ?><span class="footer-pipe"> | </span><?php } ?></span>
 			<span class="footer-powered"><?php bloginfo('name'); ?> <?Php _e('Powered by','comicpress'); ?> <a href="http://wordpress.org/">WordPress</a> <?php _e('with','comicpress'); ?> <a href="http://comicpress.org/">ComicPress</a><span class="footer-pipe"> | </span></span>
 			<span class="footer-subscribe">Subscribe: <a href="<?php bloginfo('rss2_url') ?>">RSS Feed</a><span class="footer-pipe"> | </span></span>
 			<span class="footer-uptotop"><a href="#outside" onclick="scrollup(); return false;"><?php _e('Back to Top &uarr;','comicpress'); ?></a></span>

functions.php

@@ -16,7 +16,7 @@ if (function_exists('id_get_comment_number')) {
 	remove_filter('comments_number','id_get_comment_number');
 }
 
-$comicpress_version = '2.8.1.21';
+$comicpress_version = '2.8.1.32';
 
 global $wpmu_version;
 if (!empty($wpmu_version)) {
@@ -99,7 +99,8 @@ if (get_option('upload_path') !== false) {
 				'split_column_in_two'			=> 'split_column_in_two',
 				'author_column_one'				=> 'author_column_one',
 				'author_column_two'				=> 'author_column_two',
-				'remove_wptexturize'			=> 'remove_wptexturize' ) as $options => $variable_name) {
+				'remove_wptexturize'			=> 'remove_wptexturize',
+				'disable_default_menubar'		=> 'disable_default_menubar' ) as $options => $variable_name) {
 		$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
 	}
 	
@@ -793,21 +794,27 @@ function storyline_category_list() {
 }
 
 /**
- * This is function comicpress_is_active_sidebar
+ * function is_active_sidebar
+ * check if a sidebar has widgets based on index number or name
  *
- * @param $name - sidebar name made with register_sidebar(array('name'=>'Name of Sidebar'), 
+ * @param $index - sidebar name made with register_sidebar(array('name'=>'Name of Sidebar'), 
- * use 'Sidebar 1' .. # if no sidebar names specified.
+ * OR the index # as an int for specific sidebar.
- * @return true if sidebar with $name has widgets, false if not.
+ * @return true if sidebar with $index has widgets, false if not.
  * 
  */
-function comicpress_is_active_sidebar( $name ) {
+function comicpress_is_active_sidebar( $index ) {
 	global $wp_registered_sidebars, $_wp_sidebars_widgets;
+	if ( is_int($index) ) {
+		if (!empty($_wp_sidebars_widgets[sanitize_title("sidebar-$index")]) )
+			return true;
+	} else {
 		$i = 1;
 		foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-		if ( $name == $registered_sidebar['name'] && !empty($_wp_sidebars_widgets[sanitize_title("sidebar-$i")]) )
+			if ( $index == $registered_sidebar['name'] && !empty($_wp_sidebars_widgets[sanitize_title("sidebar-$i")]) )
 				return true;
 			$i++; 
 		}
+	}
 	return false;
 }
 
@@ -836,11 +843,24 @@ function cp_copyright() {
 function comicpress_check_themepack_file($filename = '') {
 	global $themepack_directory;
 	if (empty($filename)) return false;
-	if ( ($themepack_directory != 'none' && !empty($themepack_directory) ) && file_exists(get_template_directory() . '/themepack/'.$themepack_directory.'/'.$filename) ) { 
+	if ( ($themepack_directory != 'none' && !empty($themepack_directory) ) && file_exists(get_template_directory() . '/themepack/'.$themepack_directory.'/'.$filename.'.php') ) { 
-		@include(get_template_directory() . '/themepack/' .$themepack_directory. '/'.$filename);
+		@include(get_template_directory() . '/themepack/' .$themepack_directory. '/'.$filename .'.php');
 		return true;
 	}
 	return false;
 }
 
+function rss_count_comments(){
+	global $wpdb,$post;
+	$args = func_get_args();
+	$comments = get_comments_number();
+	echo $args[0];
+	if ($comments == 0) $comment_text = " (No Comments)";
+	if ($comments == 1) $comment_text = " (1 Comment)";
+	if ($comments > 1) $comment_text = " (". $comments . " Comments)";
+	if ($comments>0) echo $comment_text;
+}
+
+add_action('the_title_rss','rss_count_comments');
+
 ?>

functions/avatars.php

@@ -92,6 +92,8 @@ function comicpress_random_default_avatar($id_or_email = '') {
 	if (empty($current_avatar_directory)) $current_avatar_directory = 'default';
 	
 	$count = count($results = glob(get_template_directory() . '/images/avatars/'.$current_avatar_directory.'/*'));
+	
+	if ($count) { 
 		$default = '';
 		
 		$checknum = hexdec(substr(md5($id_or_email),0,5)) % $count;
@@ -102,5 +104,7 @@ function comicpress_random_default_avatar($id_or_email = '') {
 		}
 		return get_bloginfo('stylesheet_directory').'/images/avatars/'.$current_avatar_directory.'/'.$default;
 	}
+	return false;
+}
 
 ?>

functions/displayblogpost.php

@@ -7,8 +7,8 @@
  */
 
 function display_blog_post() { 
-	if (comicpress_check_themepack_file('displayblogpost.php') == false) {
+	if (comicpress_check_themepack_file('displayblogpost') == false) {
-		global $post, $wp_query, $authordata, $enable_related_posts, $enable_post_author_gravatar, $enable_post_calendar, $themepack_directory;  ?>
+		global $post, $wp_query, $authordata, $enable_related_posts, $enable_post_author_gravatar, $enable_post_calendar, $themepack_directory, $disable_categories_in_posts, $disable_tags_in_posts;  ?>
 		<?php if (is_single()) { ?>
 			<div class="blognav">
 				<div class="nav-single">
@@ -55,7 +55,7 @@ function display_blog_post() {
 				<?php } ?>
 				<?php 
 					if ('open' == $post->comment_status) { 
-						if (comicpress_check_themepack_file('commentlink.php') == false) { ?>
+						if (comicpress_check_themepack_file('commentlink') == false) { ?>
 							<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('No Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
 						<?php }
 					}

functions/displaycomicpost.php

@@ -7,7 +7,7 @@
  */
 
 function display_comic_post() { 
-	if (comicpress_check_themepack_file('displaycomicpost.php') == false) {
+	if (comicpress_check_themepack_file('displaycomicpost') == false) {
 		global $post, $wp_query, $transcript_in_posts, $enable_related_comics, $enable_comic_post_author_gravatar, $enable_comic_post_calendar, $disable_categories_in_posts, $disable_tags_in_posts, $themepack_directory;
 		$first_comic = get_first_comic_permalink(); $last_comic = get_last_comic_permalink();
 		?>
@@ -59,7 +59,7 @@ function display_comic_post() {
 		<?php } ?>
 		<?php 
 			if ('open' == $post->comment_status) { 
-				if (comicpress_check_themepack_file('commentlink.php') == false) { ?>
+				if (comicpress_check_themepack_file('commentlink') == false) { ?>
 					<div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&nbsp;</span> '.__('No Comments ','comicpress'), '<span class="comment-balloon">1</span> '.__('Comment ','comicpress'), '<span class="comment-balloon">%</span> '.__('Comments ','comicpress')); ?></div>
 				<?php }
 			}

functions/moods.php

@@ -34,8 +34,6 @@ function comicpress_showmood_edit_post() {
 	global $post;
 	$moods_directory = get_option('comicpress-moods_directory');
 	if (!empty($moods_directory) && $moods_directory != 'none') { ?>
-		<div id="mooddiv" class="postbox">
-		<h3><?php _e("Available Moods", 'comicpress') ?></h3>
 		<div class="inside" style="overflow: hidden">
 		<?php _e('Available Moods, you can set which mood images to use in the comicpress Options.','comicpress'); ?><br />
 		<br />
@@ -78,7 +76,6 @@ function comicpress_showmood_edit_post() {
 			<?php }
 		} ?>
 		</div>
-		</div>
 	<?php }
 }
 
@@ -95,7 +92,18 @@ function comicpress_handle_edit_post_mood_save($post_id) {
 	}
 }
 
+function mood_admin_function() {
+	add_meta_box(
+			'mood-for-this-post',
+			__('Mood For This Post', 'comicpress'),
+			'comicpress_showmood_edit_post',
+			'post',
+			'normal',
+			'low'
+			);
+}
 
-add_action('edit_form_advanced', 'comicpress_showmood_edit_post', 5, 1);
+add_action('admin_menu', 'mood_admin_function');
+// add_action('edit_form_advanced', 'comicpress_showmood_edit_post', 5, 1);
 add_action('save_post', 'comicpress_handle_edit_post_mood_save' ,5, 1);
 ?>

functions/multicomics.php

@@ -15,16 +15,6 @@ function display_comics_multi() {
 			<img src="<?php echo get_option('home'). '/' .$pathto_comic; ?>" alt="<?php the_title(); ?>" title="<?php the_hovertext(); ?>" />
 			</div>
 		<?php }
-	} else {
-		if (($folder == 'archive' || $folder == 'rss')) {
-			if (($result = get_comic_path('comic', '', '', 1)) !== false) {
-				foreach ($result as $pathto_comic) { ?>
-					<div class="comicdisp">
-					<img src="<?php echo get_option('home'). '/' .$pathto_comic; ?>" alt="<?php the_title(); ?>" title="<?php the_hovertext(); ?>" />
-					</div>
-				<?php }
-			}
-		}
 	}
 	return false;
 }

header.php

@@ -58,8 +58,7 @@
 	<?php } 
 } ?>
 
-<?php 
+<?php if (comicpress_check_themepack_file('header') == false) { ?>
-if (comicpress_check_themepack_file('header.php') == false) { ?>
 	<div id="header">
 		<?php if (function_exists('the_project_wonderful_ad')) { ?>
 			<div class="headerpwad">

images/nav/default/navstyle.css

@@ -62,7 +62,9 @@ Style: Default
 	background: url('buyprint.png') no-repeat;
 }
 
-	.navi-buyprint:hover {
+	.navi-buyprint:hover, button .navi-buyprint:hover {
+		background: url('buyprint.png') no-repeat;
+		background-position: -66px 0;
 		color: #f00;
 	}
 

index.php

@@ -20,7 +20,7 @@
 
 		<?php $wp_query ->in_the_loop = true; $comicFrontpage = new WP_Query(); $comicFrontpage->query('showposts=1&cat='.get_all_comic_categories_as_cat_string());
 		while ($comicFrontpage->have_posts()) : $comicFrontpage->the_post() ?>	
-			<?php if (comicpress_check_themepack_file('displaycomic.php') == false) { ?>
+			<?php if (comicpress_check_themepack_file('displaycomic') == false) { ?>
 			<div id="comic-wrap">
 				<div id="comic-head"><?php get_sidebar('over'); ?></div>
 				<div class="clear"></div>
@@ -75,15 +75,17 @@ if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes'
 		$blog_query = 'showposts='.$blog_postcount.'&cat="-'.exclude_comic_categories().'"&paged='.$paged; 
 		
 		$posts = query_posts($blog_query);
-		if (have_posts()) {
+		if (have_posts()) { ?>
-			
+			<div class="blogindex-head"></div>
-			while (have_posts()) : the_post();
+			<div class="blogindex">
+			<?php while (have_posts()) : the_post();
 				
 				display_blog_post();	
 			
-			endwhile;
+			endwhile; ?>
-			
+			</div>
-		}
+			<div class="blogindex-foot"></div>
+		<?php }
 		comicpress_pagination();
 	} else { ?>
 	<div id="dualcolumns">

options/menubaroptions.php

@@ -6,6 +6,20 @@
 	<?php
 	foreach ($options as $value) {
 		switch ( $value['type'] ) {
+			case "comicpress-disable_default_menubar": ?>
+				<tr>
+				<th scope="row"><strong><?php _e('Disable the default menubar?','comicpress'); ?></strong><br /><br /></th>
+				<td valign="top" width="100">
+				<label><input name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-yes" type="radio" value="yes"<?php if ( get_option( $value['id'] ) == "yes") { echo " checked"; } ?> /><?php _e('Yes','comicpress'); ?></label>
+				&nbsp;&nbsp;
+				<label><input  name="<?php echo $value['id']; ?>" id="<?php echo $value['id']; ?>-no" type="radio" value="no"<?php if ( get_option( $value['id'] ) == "no") { echo " checked"; } ?> /><?php _e('No','comicpress'); ?></label>
+				</td>
+				<td valign="top">
+					<?php _e('This will let you use the menubar widget to place the menubar in other sidebars.','comicpress'); ?>
+				</td>
+				</tr>
+				
+				<?php break;
 			case "comicpress-enable_search_in_menubar": ?>
 				<tr>
 				<th scope="row"><strong><?php _e('Enable Search Form in Menubar?','comicpress'); ?></strong><br /><br /></th>

options/themestyle.php

@@ -35,6 +35,9 @@
 					<td valign="top">
 						<img id="cpthemestyle" src="<?php echo get_bloginfo('stylesheet_directory'); ?>/images/options/<?php echo get_option($value['id']); ?>.png" alt="ComicPress Theme Style" />
 					</td>
+					<td valign="top">
+						Standard and Vertical themes are 780px, 3 Column, Graphic Novel and Vertical 3 Column are 980px wide.
+					</td>
 				</tr>
 				
 				<?php break;

searchform-transcript.php

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

searchform.php

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

sidebar-left.php

@@ -3,15 +3,21 @@ if ($disable_lrsidebars_frontpage == 'yes' && is_home()) {
 } else {  ?>
 <div id="sidebar-left">
 	<div class="sidebar-top"></div>
-	<div class="sidebar-content">
 	<div class="sidebar">
 		<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left Sidebar') ) : ?> 
 			<?php $default_image = get_bloginfo('stylesheet_directory').'/images/cal/default.png'; ?>
+			<div class="widget">
 				<?php comicpress_calendar(array('thumbnail' => $default_image)) ?>
-				<?php comicpress_archive_dropdown(); ?>
-				<?php comicpress_latest_comics() ?>
-			<?php endif; ?>
 			</div>
+			<div class="widget">
+				<?php comicpress_archive_dropdown(); ?>
+			</div>
+			<div class="widget">
+			<ul><li>
+				<?php comicpress_latest_comics() ?>
+			</li></ul>
+			</div>
+		<?php endif; ?>
 	</div>
 	<div class="sidebar-bottom"></div>
 </div>

sidebar-menubar.php

@@ -1,9 +1,16 @@
+<?php 
+	global $disable_default_menubar;
+	if ($disable_default_menubar != 'yes') {
+		comicpress_menubar();
+	} 
+?>
 <?php if (comicpress_is_active_sidebar('Menubar')) { ?>
 <div id="sidebar-menubar">
 	<div class="customsidebar <?php global $enable_if_widgetarea_use_sidebar_css; if ($enable_widgetarea_use_sidebar_css == 'yes') { ?> sidebar<?php } ?>">
-		<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Menubar') ) : ?><?php endif; ?>
+		<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Menubar') ) : ?>	
+		<?php endif; ?>
 	</div>
 </div>
-<?php } else { 
+<?php } ?>
-	comicpress_menubar();
+
-} ?>
+	

sidebar-right.php

@@ -3,32 +3,28 @@ if ($disable_lrsidebars_frontpage == 'yes' && is_home()) {
 } else {  ?>
 <div id="sidebar-right">
 	<div class="sidebar-top"></div>
-	<div class="sidebar-content">
 		<div class="sidebar">
 			<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Right Sidebar') ) : ?>
 				<?php comicpress_comic_bookmark() ?>
 				
 				<?php if (is_cp_theme_layout('standard,v')) { ?>
-					<ul>
-						<li>
 				<?php $default_image = get_bloginfo('stylesheet_directory').'/images/cal/default.png'; ?>
+					<div class="widget">
 						<?php comicpress_calendar(array('thumbnail' => $default_image)) ?>
-						</li>
+					</div>
-					</ul>
 				<?php } ?>
-					<ul>
+				<div class="widget">
-						<li>
+				<ul><li>
 					<h2>Menu</h2>
 						<ul>
 							<?php wp_list_pages('title_li=') ?>
 						</ul>
-						</li>
+				</li></ul>
-					</ul>
-
-					<ul><?php wp_list_categories('title_li=<h2>Categories</h2>') ?></ul>
-
-				<?php endif; ?>
 				</div>
+				<div class="widget">
+					<ul><?php wp_list_categories('title_li=<h2>Categories</h2>') ?></ul>
+				</div>
+			<?php endif; ?>
 		</div>
 	<div class="sidebar-bottom"></div>
 </div>

single.php

@@ -16,7 +16,8 @@
 
 	<?php while (have_posts()) : the_post(); 
 		if (in_comic_category()) { ?>
-			<?php if (comicpress_check_themepack_file('displaycomic.php') == false) { ?>
+			<?php if (comicpress_check_themepack_file('displaycomic') == false) { ?>
+			<div id="comic-wrap">
 				<div id="comic-head"><?php get_sidebar('over'); ?></div>
 				<div class="clear"></div>
 				<?php get_sidebar('comicleft'); ?>
@@ -24,6 +25,7 @@
 				<?php get_sidebar('comicright'); ?>
 				<div class="clear"></div>
 				<div id="comic-foot"><?php get_sidebar('under'); ?></div>
+			</div>
 			<?php } ?>
 	<?php } endwhile; ?>
 	

style.css

@@ -17,10 +17,6 @@ body {
 	margin: 0;
 	font-family: 'Arial', sans-serif;
 	font-size: 12px;
-	font-style: normal;
-	font-weight: normal;
-	text-transform: none;
-	letter-spacing: normal;
 	color: #000;
 }
 
@@ -58,24 +54,24 @@ small {
 hr {
 	height: 1px;
 	color: #000;
+	background-color: #000;
 	border: 0px;
 }
 
 blockquote {
 	margin: 10px;
 	padding: 5px 10px 5px 20px;
+	font-family: 'Georgia', serif;
+	font-size: 13px;
 	border-width: 1px 1px 1px 5px;
 	border-style: solid;
 	border-color: #000;
 }
 
-blockquote cite {
-	margin: 5px 0 0;
-	display: block;
-}
-
 cite {
-	font-size: 13px;
+	display: block;
+	font-family: 'Arial', sans-serif;
+	font-size: 11px;
 	font-weight: bold;
 	font-style: normal;
 }
@@ -88,39 +84,19 @@ acronym, abbr {
 	border-bottom: 1px dashed #000;
 }
 
-pre { 
+code {
-	background: #eee; 
 	padding: 5px;
-	border: 1px solid #999;
+	margin: 10px 0; 
-	overflow: hidden;
+	display: block;
-	margin: 0 0 15px 0; 
+	overflow: auto;
-	font-family: Courier, Monospace;
+	font-family: 'Courier', monospace;
+	border: 1px dotted #000;
 }
 
 form {
 	margin: 0;
 }
 
-	.button {
-		height: 25px;
-		padding: 0 5px;
-		color: #000;
-		font-family: 'Arial', sans-serif;
-		font-size: 13px;
-		line-height: 13px;
-		cursor: pointer;
-	}
-		
-	.button:hover {
-		color: #fff;
-		background: #f00;
-	}
-
-.sfhover {
-	padding: 0;
-	margin: 0;
-}
-
 /* HEADINGS */
 
 h1, h1 a {
@@ -128,7 +104,7 @@ h1, h1 a {
 	margin: 0;
 	color: #fff;
 	font-size: 56px;
-	font-family: 'georgia' , serif;
+	font-family: 'Georgia' , serif;
 	font-weight: normal;
 	line-height: 46px;
 	text-decoration: none;
@@ -137,14 +113,14 @@ h1, h1 a {
 }
 
 h2, h2 a {
+	padding: 0 0 2px 0;
 	margin: 0;
 	color: #333;
-	font-weight: normal;
+	font-family: 'Trebuchet MS', sans-serif;
-	letter-spacing: -1px;
 	font-size: 24px;
 	line-height: 24px;
-	padding-bottom: 2px;
+	font-weight: normal;
-	font-family: 'trebuchet ms';
+	letter-spacing: -1px;	
 }
 
 	h2.pagetitle, h2.pagetitle a {
@@ -167,15 +143,9 @@ h3, h3 a {
 	text-decoration: none;
 	clear: both;
 	letter-spacing: -1px;
-	font-family: 'verdana';
 }
 
 /* THE PAGE WRAPPER */
-/* Change this width to set the entire site's width - increase/reduce #content width by the same amount */
-
-/* Maintains the #page and #pagewide width after padding is set */
-#page-wrap, #page-wrap-wide {
-}
 
 #page {
 	width: 780px;
@@ -183,7 +153,7 @@ h3, h3 a {
 }
 
 #page-wide {
-	width: 990px;
+	width: 980px;
 	margin: 0px auto;
 }
 
@@ -311,6 +281,11 @@ h3, h3 a {
 		background: #b00; /* Main menu highlighted background color */
 	}
 
+	.sfhover {
+		padding: 0;
+		margin: 0;
+	}
+	
 	/* For submenu dropdowns - this order must be maintained */
 
 	#menu ul {
@@ -363,13 +338,9 @@ h3, h3 a {
 
 /* THE COMIC */
 
-#comic-head {
-}
-
 #comic {
 	padding: 5px 0;
 	text-align: center;
-	z-index: 100;
 }
 
 #comic-foot {
@@ -384,7 +355,6 @@ h3, h3 a {
 }
 	
 	#footer .footer-pipe {
-		color: #fff000;
 		padding: 0 2px;
 	}
 
@@ -452,11 +422,11 @@ a.navi-comments:hover span {
 /* POSTS - PAGES */
 
 #pagewrap-right {
-	width: 780px;
+	width: 770px;
-	float: left;
-	overflow: hidden;
 	padding: 0;
 	margin: 0;
+	float: left;
+	overflow: hidden;	
 }
 
 #content {
@@ -464,13 +434,19 @@ a.navi-comments:hover span {
 }
 
 	.narrowcolumn {
-		width: 560px;
+		width: 540px;
-		padding: 5px;
+		padding: 5px 10px;
+	}
+	
+	/* add 10px to smaller width layouts */
+		.layout-standard .narrowcolumn, .layout-v .narrowcolumn {
+			width: 550px;
 		}
 		
 	.widecolumn {
-		width: 770px;
+		width: 760px;
-		padding: 5px;
+		padding: 5px 10px;
+		overflow: hidden;
 	}
 	
 	.column {
@@ -503,12 +479,6 @@ a.navi-comments:hover span {
 	text-align: left;
 }
 
-.post-head, .post-page-head, .post-comic-head {
-}
-
-.post-foot, .post-comic-foot, .post-page-foot {
-}
-
 .post-page-head {
 	padding-top: 5px;
 }
@@ -629,12 +599,9 @@ a.navi-comments:hover span {
 /* THE BLOG HEADER */
 
 #blogheader {
-	font-family: 'Georgia' , serif;
 	padding: 5px 0 5px 0;
-	font-size: 32px;
-	letter-spacing: -2px;
 	border-top: 1px solid #999;
-	margin-top: 10px;
+	margin: 10px 0 20px 0;
 }
 
 /* COMMENTS */
@@ -653,9 +620,6 @@ a.navi-comments:hover span {
 	font-family: 'Georgia' , serif;
 }
 
-.commentlist {
-}
-
 .comment {
 	padding: 2px;
 	clear: both;
@@ -748,22 +712,11 @@ ul.children {
 
 .comicthumbwrap {
 	float: left;
-	max-width: 120px;
+	padding: 2px 2px 6px 2px;
-	max-height: 130px;
-	overflow: hidden;
-	margin: 2px 2px 6px 2px;
 }
 
-.comicthumbwrap img {
+.comicarchiveframe img {
-	width: 120px;
-	max-height: 130px;
-}
-
-.comicarchiveframe {
-	padding: 5px;
 	border: 1px solid #000;
-	background: #fff;
-	margin-bottom: 2px;
 }
 
 .comicarchiveframe:hover {
@@ -821,38 +774,26 @@ ul.children {
 }
 
 	.sidebar h2, .sidebar h2 a {
-		margin: 10px 0 0 0;
-		padding: 0 0 0 1px;
-		font-family:arial;
 		display: block;
-		font-size: 16px;
+		display: block;
+		font-size: 17px;
+		margin: 0;
+		padding: 0;
 	}
 	
 	.sidebar ul {
 		margin: 0;
-		padding: 0 0 0 14px;
+		padding: 0;
 		list-style: none;
 	}
 
 		.sidebar ul li {
-			margin: 0;
+			margin: 0 0 0 10px;
 			padding: 0;
-			text-align: left;
-			list-style: none;
 		}
 
-		.sidebar ul li ul li {
+	.widget {
-			margin: 0;
+		margin-bottom: 10px;
-			padding: 0;
-			text-align: left;
-		}
-
-	.sidebar li h2 {
-		margin-top: 15px;
-	}
-
-	.sidebar .widget {
-		margin: 10px 0;
 	}
 	
 	.sidebar .widget .post-extras, .sidebar .widget .entry {
@@ -890,6 +831,8 @@ ul.children {
 /* CALENDAR */
 
 #wp-calendar-wrap {
+	margin: 0 auto;
+	width: 170px;
 	background:#fff;
 	padding:10px;
 	border:1px solid #999;
@@ -980,20 +923,8 @@ ul.children {
 	float: left;
 }
 	
-	#s-search:hover, #s-search:focus, #s-transcript:hover, #s-transcript:focus {
-	}
-
 #searchform button, #searchform-transcript button {
-		height: 24px;
+	height: 23px;
-		width: 23px;
-		line-height: 20px;
-		cursor: pointer;
-	}
-
-	#searchform button:hover, #searchform-transcript button:hover {
-	}
-
-	#searchform button:hover, #searchform-transcript button:-moz-focus-inner {
 	}
 
 .searchresults {

themepack/blueocean/commentlink.php

@@ -0,0 +1,5 @@
+<?php global $post; if ($post->comment_status != 'closed') { ?>
+	<div class="comment-link">
+		<?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&rdquo;</span>', '<span class="comment-balloon">1</span>', '<span class="comment-balloon">%</span>'); ?>
+	</div>
+<?php } ?>

themepack/blueocean/nav/navstyle.css

@@ -0,0 +1,128 @@
+/* COMIC NAVIGATION 
+Author: Tyler Martin
+Style: Default
+*/
+#comic_navi_wrapper {
+	padding: 5px 0 10px 0;
+}
+
+#comic_navi {
+	display: table;
+	border-collapse: collapse;
+	margin: 0 auto;
+
+}
+
+.navi-comictitle {
+	text-align: center;
+	float: left;
+	display: block;
+	padding-top: 26px;
+	max-width: 200px;
+}
+
+.navi {
+	width: 66px;
+	padding: 66px 0 0 0;
+/*	margin: 0 5px; */
+	display: block;
+	float: left;
+	overflow: hidden;
+	font-size: 11px;
+	text-align: center;
+	color: #555;
+}
+
+	.navi:hover {
+		background-position: -66px 0;
+	}
+
+.navi-first {
+	margin: 0;
+	background: url('first.png') no-repeat;
+}
+
+.navi-prevchap {
+	background: url('prevchap.png') no-repeat;
+}
+
+.navi-prev {
+	margin-right: 30px;
+	background: url('prev.png') no-repeat;
+}
+
+
+.navi-comments, .navi-archive, .navi-random, .navi-buyprint {
+	margin: 0 5px;
+}
+
+.navi-buyprint {
+	border: none;
+	cursor: pointer;
+	background: url('buyprint.png') no-repeat;
+}
+
+	.navi-buyprint:hover, button .navi-buyprint:hover {
+		background: url('buyprint.png') no-repeat;
+		background-position: -66px 0;
+		color: #f00;
+	}
+
+	.navi-buyprint-form {
+		width: 76px;
+		display: block;
+		float: left;
+		margin: 0;
+		padding: 0;
+		}
+
+.navi-archive {
+	background: url('archive.png') no-repeat;
+}
+
+.navi-random {
+	background: url('random.png') no-repeat;
+}
+
+.navi-comments {
+	padding: 0;
+	background: url('comments.png') no-repeat;
+}
+
+	a.navi-comments span {
+		width: 66px;
+		height: 66px;
+		display: block;
+		font-size: 16px;
+		font-weight: bold;
+		line-height: 66px;
+		color: #c5c5c5;
+	}
+	
+		a.navi-comments span:hover {
+			color: #860b04;
+			}
+	
+.navi-next {
+	margin-left: 30px;
+	background: url('next.png') no-repeat;
+}
+
+.navi-nextchap {
+	background: url('nextchap.png') no-repeat;
+}
+
+.navi-last {
+	margin: 0;
+	background: url('last.png') no-repeat;
+}
+
+.navi-void, .navi-void:hover {
+	color: #999;
+	background-position: -132px 0;
+}
+
+.comic-left .navi-prev, .comic-right .navi-prev, .comic-left .navi-next, .comic-right .navi-next {
+/*	margin: 0 5px; */
+	}
+

themepack/blueocean/notes.php

@@ -0,0 +1,7 @@
+<strong>ThemePack</strong>: Blue Ocean<br />
+<strong>Author</strong>: ComicPress Developement Team<br />
+<strong>Version</strong>: 0.1.1<br />
+<br />
+<strong>Installation Notes</strong>:<br />
+Has Buttons
+<br />

themepack/blueocean/style.css

@@ -0,0 +1,562 @@
+/*
+ThemePack Name: Blue Ocean
+ThemePack URI: http://comicpress.org
+Author: Tyler Martin / Philip M. Hofer
+Author URI: http://mindfaucet.com/
+Version: 0.1.1
+*/
+
+/* STANDARD TAGS */
+
+body {
+	margin: 0;
+	font-family: 'Arial', sans-serif;
+	color: #333;
+	background: #01344f url('background.png') top center repeat-x;
+}
+
+a {
+	color: #0076b6;
+}
+
+a:hover {
+	color: #f00;
+}
+
+h1, h1 a, h2, h2 a, h3, h3 a {
+	color: #0b3b6e;
+}
+
+h1 a:hover, h2 a:hover, h3 a:hover {
+	color: #fff;
+}
+
+.nav a { color: #fff; }
+.nav a:hover { color: #fff000; }
+
+button {
+	background: #aaa url('menu.png');
+	color: #000;
+	font-family: 'Arial', sans-serif;
+	font-size: 13px;
+	line-height: 13px;
+	border: 1px solid #999;
+	cursor: pointer;
+}
+		
+	button:hover {
+		color: #fff;
+		background: #f00 url('menu.png') 0 -75px;
+	}
+
+/* THE HEADER */
+
+#header {
+	text-align: center;
+}
+
+	#header a {
+		color: #eee;
+	}
+
+	#header .description {
+		color: #555;
+		padding: 0 0 10px 0;
+		font-size: 14px;
+		font-style: italic;
+		letter-spacing: 2px;
+	}
+
+
+/* THE MENU */
+
+#menubar {
+	background: url('menu.png');
+	border-width: 1px 1px 1px 0;
+	border-style: solid;
+	border-color: #000;
+	-moz-border-radius: 10px;
+	-khtml-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+}
+
+#menunav {
+	margin-right: 8px;
+}
+
+.menunav-rss {
+	width: 25px;
+	height: 25px;
+	margin: 0 0 0 4px;
+	padding: 0;
+	display: block;
+	float: left;
+	text-indent: -9999px;
+	overflow: hidden;
+	background: url('menu-nav.png') no-repeat;
+}
+
+	.menunav-rss:hover {
+		background: Transparent url('menu-nav.png') 0 -25px no-repeat;
+	}
+
+.menunav a:hover {
+	background: #fff;
+}
+
+#menu {
+	border-right: 1px solid #111;
+	margin-left: 10px;
+	text-transform: uppercase;
+}
+
+	#menu a {
+		padding: 0px 10px 0 10px;
+		display: block;
+		color: #fff;
+		text-decoration: none;
+	}
+
+	#menu li .rss {
+		padding: 5px 0 5px 0;
+	}
+
+	#menu li {
+		float: left;
+		cursor:pointer;
+	}
+
+	#menu li a {
+		border-left: 1px solid #333;
+		border-right: 1px solid #555;
+	}
+
+	#menu li:hover a, #menu li.sfhover a {
+		border-left: 1px solid #8b160f;
+		border-right: 1px solid #c28380;
+		color: #fff; /* Main menu highlighted text color */
+		background: url('menu.png') 0 -75px;
+	}
+
+	#menu li:hover, #menu li.sfhover {
+		/* Main menu highlighted background color */
+	}
+
+	/* For submenu dropdowns - this order must be maintained */
+
+	#menu ul {
+		padding: 0;
+		margin: 0;
+		list-style: none;
+		position: absolute;
+		left: -9999px;
+		width: 175px;
+		line-height: 1;
+	}
+	#menu li li {
+		width: 165px;
+		padding: 4px 5px;
+		color: #fff;
+	}
+	#menu li li a {
+		width: 174px;
+		padding: 0;
+		color: #fff;
+		border: none;
+	}
+	#menu li ul ul {
+		margin: -17px 0 0 170px;
+	}
+	#menu li ul li:hover a, #menu li ul li li:hover a, #menu li ul li li li:hover a, #menu li ul li li li:hover a {
+		color: #fff; /*Submenu highlighted text color */
+	}
+	#menu li:hover li a, #menu li li:hover li a, #menu li li li:hover li a, #menu li li li li:hover li a {
+		color: #fff; /*Submenu text color */
+		border: none;
+		background: none;
+	}
+	#menu li li:hover {
+		background: #f00; /*Submenu highlighted background color */
+	}
+	#menu li:hover ul ul, #menu li:hover ul ul ul, #menu li:hover ul ul ul ul, #menu li.sfhover ul ul, #menu li.sfhover ul ul ul, #menu li.sfhover ul ul ul ul {
+		left: -9999px;
+	}
+	#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: #3d5875; /* Submenu background color */
+		text-transform: none;
+	}
+
+	#menu .current_page_item a {
+		color: #fff;
+		border-left: 1px solid #555;
+		border-right: 1px solid #555;
+		background: url('menu.png') 0 -50px;
+	}
+
+/* THE COMIC */
+
+#comic-head {
+	padding-top: 2px;
+}
+
+#comic {
+	background: #fff;
+	border: 1px solid #000;
+	text-align: center;
+	z-index: 100;
+	padding: 5px;
+	-moz-border-radius: 0 10px 10px 10px;
+	-khtml-border-radius: 0 10px 10px 10px;
+	-webkit-border-radius: 0 10px 10px 10px;
+	border-radius: 0 10px 10px 10px;
+}
+
+#subcontent-wrapper{
+	background: #004c74;
+	border: solid 1px #000;
+	-moz-border-radius: 10px 0 10px 0;
+	-khtml-border-radius: 10px 0 10px 0;
+	-webkit-border-radius: 10px 0 10px 0;
+	border-radius: 10px 0 10px 0;
+}
+
+.narrowcolumn {
+	width: 538px;
+}
+
+.layout-standard .narrowcolumn, .layout-v .narrowcolumn {
+	width: 548px;
+}
+
+.post, .post-page, .post-comic, #comment-wrapper { 
+	background: #bcc7d2;
+	border: solid 1px #000;
+	-moz-border-radius: 0 10px 10px 10px;
+	-khtml-border-radius: 0 10px 10px 10px;
+	-webkit-border-radius: 0 10px 10px 10px;
+	border-radius: 0 10px 10px 10px;
+	padding: 5px;
+}
+
+.sidebar a {
+	color: #fff;
+}
+
+.sidebar a:hover {
+	color: #81c4e7;
+}
+
+.sidebar h2, .sidebar h2 a {
+	color: #c3e1f1;
+}
+
+.sidebar h2 a:hover {
+	color: #fff;
+}
+
+#respond button {
+	float: right;
+	color: #fff;
+}
+
+/* COMMENT LINK */
+
+.comment-link {
+	height: 25px;
+	line-height: 20px;
+	font-family: 'Arial', sans-serif;
+	font-weight: bold;
+	text-align: right;
+}
+
+	.comment-link a {
+		color: #333;
+		padding: 0 5px 0 0;
+	}
+		
+	.comment-link a:hover {
+		color: #800;
+	}
+		
+	.comment-balloon {
+		width: 30px;
+		height: 25px;
+		display: block;
+		float: right;
+		overflow: hidden;
+		text-align: center;
+		line-height: 16px;
+		font-family: 'Georgia', serif;
+		font-size: 16px;
+		font-weight: normal;
+		background: url('comment-balloon.png') no-repeat;
+	}
+	
+		.comment-link a:hover .comment-balloon {
+			color: #fff;
+			background-position: 0 -25px;
+		}
+		
+	.comment-balloon-empty {
+		font-size: 20px;
+		line-height: 30px;
+		}
+
+
+/* WIDGETS */
+
+.archive-dropdown-wrap {
+	background: url('browse-search.png') no-repeat;
+}
+
+	.archive-dropdown-wrap:hover {
+		background-position: 0 -23px;
+	}
+
+.archive-dropdown {
+	margin: 0;
+	padding: 0;
+	width: 166px;
+	height: 23px;
+	font-size: 12px;
+	font-family: 'Arial' , sans-serif;
+	border: none;
+	opacity: 0;
+	filter: alpha(opacity=0);
+	cursor: pointer;
+}
+
+/* SEARCH */
+
+#s-search, #s-transcript {
+	width: 138px;
+	padding: 4px 0 0 5px;
+	font-size: 12px;
+	height: 19px;
+	font-family: 'Arial' , sans-serif;
+	color: #000;
+	border: none;
+	float: left;
+	background: url('browse-search.png') 0 -46px no-repeat;
+}
+
+	#s-search:hover, #s-search:focus, #s-transcript:hover, #s-transcript:focus {
+		color: #550000;
+		background-position: 0 -69px;
+	}
+
+	#searchform button, #searchform-transcript button {
+		padding: 0;
+		margin: 0;
+		border: none;
+		height: 23px;
+		width: 23px;
+		line-height: 0;
+		font-size: 0;
+		cursor: pointer;
+		text-indent: -9999px;
+		background: url('browse-search.png') -143px -46px no-repeat;
+	}
+
+	#searchform button:hover, #searchform-transcript button:hover {
+		background-position: -143px -69px;
+	}
+
+	#searchform button:hover, #searchform-transcript button:-moz-focus-inner {
+		border: 0;
+	}
+
+	.searchresults {
+		float: right;
+		padding: 5px;
+	}
+
+/* GALLERY */
+
+.gallery-image {
+	width: 518px;
+	border: 1px solid #000;
+	overflow: hidden;
+	background: #000;
+	text-align: center;
+}
+
+.gallery-caption {
+	font-size: 11px;
+}
+
+	.gallery-caption p {
+		width: 510px;
+		padding: 5px;
+		margin: 0;
+		text-align: center;
+		color: #fff;
+		background: #000;
+	}
+
+.imagenav-wrap {
+	margin: 5px 0 0 0;
+}
+
+.imagenav {
+	width: 77px;
+	height: 77px;
+	float: left;
+	overflow: hidden;
+}
+
+.imagenav-center {
+	width: 344px;
+	height: 65px;
+	margin: 0 5px;
+	padding: 10px 5px 0 5px;
+	float: left;
+	color: #000;
+	text-align: center;
+	border: 1px solid #000;
+	overflow: hidden;
+}
+
+.imagetitle {
+	color: #000;
+	font-size: 18px;
+}
+
+.imagenav-bg {
+	width: 75px;
+	height: 75px;
+	position: absolute;
+	z-index: 0;
+	background: #ddd;
+	border: 1px solid #000;
+	overflow: hidden;
+}
+
+.imagenav-bg img {
+	width: 75px;
+	height: 75px;
+}
+
+.imagenav-arrow {
+	width: 75px;
+	height: 75px;
+	position: absolute;
+	z-index: 1;
+	color: #fff;
+	font-size: 80px;
+	font-weight: bold;
+	line-height: 75px;
+	text-align: center;
+	border: 1px solid #000;
+	float: left;
+}
+
+.imagenav-link {
+	width: 75px;
+	height: 75px;
+	position: absolute;
+	z-index: 2;
+	border: 1px solid #000;
+	float: left;
+	overflow: hidden;
+}
+
+.imagenav-link img {
+	width: 75px;
+	height: 75px; 
+/*		opacity: 0.50; 		filter: alpha(opacity=50); */
+}
+
+.imagenav-link img:hover {
+/*		opacity: 0.00;  	filter: alpha(opacity=0); */
+}
+
+/* Pagination */
+
+#wp-paginav {
+	background: url('menu.png');
+	text-align: left;
+	border: 1px solid #000;
+	-moz-border-radius: 10px;
+	-khtml-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+}
+
+#paginav {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	float: left;
+	line-height: 25px;
+	font-size: 13px;
+	color: #fff;
+	border-right: 1px solid #222;
+}
+
+	#paginav .paginav-pages, #paginav .paginav-extend {
+		padding: 0 15px 0 15px;
+	}
+
+	#paginav a {
+		padding: 0px 10px 0 10px;
+		display: block;
+		color: #777;
+		text-decoration: none;
+	}
+
+	#paginav ul {
+		margin: 0;
+		padding: 0;
+		list-style: none;
+	}
+
+	#paginav li {
+		float: left;
+	}
+
+	#paginav li a {
+		border-left: 1px solid #111;
+		border-right: 1px solid #444;
+		color: #eee;
+	}
+
+	#paginav .paginav-next, #paginav .paginav-previous {
+		font-size: 20px;
+	}
+
+	#paginav .paginav-current, #paginav .current {
+		padding: 0px 10px 0 10px;
+		color: #fff;
+		border-left: 1px solid #222;
+		background: url('menu.png') 0 -150px;
+	}
+
+	#paginav li:hover a {
+		border-left: 1px solid #333;
+		border-right: 1px solid #555;
+		color: #fff; 
+		background: url('menu.png') 0 -75px;
+	}
+
+
+#wp-calendar-wrap {
+	width: 170px;
+	border: solid 1px #000;
+	-moz-border-radius: 0 10px 10px 10px;
+	-khtml-border-radius: 0 10px 10px 10px;
+	-webkit-border-radius: 0 10px 10px 10px;
+	border-radius: 0 10px 10px 10px;
+}
+
+#footer {
+	background: #fff;
+	border: solid 1px #000;
+	-moz-border-radius: 0 10px 10px 10px;
+	-khtml-border-radius: 0 10px 10px 10px;
+	-webkit-border-radius: 0 10px 10px 10px;
+	border-radius: 0 10px 10px 10px;
+	margin-top: 10px;
+}

themepack/boxed/notes.php

@@ -1,6 +1,6 @@
 <strong>ThemePack</strong>: boxed<br />
 <strong>Author</strong>: ComicPress Development Team<br />
-<strong>Version</strong>: 1.4<br />
+<strong>Version</strong>: 0.1.5<br />
 <br />
 <strong>Installation Notes</strong>:<br />
 None<br />

themepack/boxed/style.css

@@ -3,13 +3,13 @@ ThemePack Name: boxed
 ThemePack URI: http://comicpress.org
 Author: ComicPress Developement Team
 Author URI: http://mindfaucet.com/
-Version: 0.1.4
+Version: 0.1.5
 */
 
 /* STANDARD TAGS */
 
 body {
-	background: #444 url('background.png') repeat;
+	background: #222 url('background.png') repeat;
 }
 
 #page, #page-wide {

themepack/moosemountain/nav/navstyle.css

@@ -10,11 +10,29 @@ Style: Default
 	display: table;
 	border-collapse: collapse;
 	margin: 0 auto;
+
+}
+
+.navi-comictitle {
+	text-align: center;
+	float: left;
+	display: block;
+	font-weight: bold;
+	padding-top: 18px;
+	max-width: 200px;
+}
+	.navi-comictitle a {
+		color: #5E6F29;
+	}
+	
+	.navi-comictitle a:hover {
+		color: #5E6F29;
+		text-decoration: underline;
 	}
 
 .navi {
-	width: 66px;
+	width: 50px;
-	padding: 66px 0 0 0;
+	padding: 50px 0 0 0;
 /*	margin: 0 5px; */
 	display: block;
 	float: left;
@@ -25,7 +43,7 @@ Style: Default
 }
 
 	.navi:hover {
-		background-position: -66px 0;
+		background-position: -50px 0;
 	}
 
 .navi-first {
@@ -38,7 +56,7 @@ Style: Default
 }
 
 .navi-prev {
-	margin-right: 30px;
+	margin-right: 10px;
 	background: url('prev.png') no-repeat;
 }
 
@@ -79,12 +97,12 @@ Style: Default
 }
 
 	a.navi-comments span {
-		width: 66px;
+		width: 50px;
-		height: 66px;
+		height: 50px;
 		display: block;
 		font-size: 16px;
 		font-weight: bold;
-		line-height: 66px;
+		line-height: 50px;
 		color: #c5c5c5;
 	}
 	
@@ -93,7 +111,7 @@ Style: Default
 			}
 	
 .navi-next {
-	margin-left: 30px;
+	margin-left: 10px;
 	background: url('next.png') no-repeat;
 }
 
@@ -108,10 +126,9 @@ Style: Default
 
 .navi-void, .navi-void:hover {
 	color: #999;
-	background-position: -132px 0;
+	background-position: -100px 0;
 }
 
 .comic-left .navi-prev, .comic-right .navi-prev, .comic-left .navi-next, .comic-right .navi-next {
 /*	margin: 0 5px; */
 	}
-

themepack/moosemountain/style.css

@@ -133,7 +133,7 @@ h2 a:hover, h3 a:hover {
 	display: none;
 }
 
-#menu-rss {
+#sidebar-header #menu-rss {
 	height: 40px;
 	width: 60px;
 	display: block;
@@ -142,11 +142,11 @@ h2 a:hover, h3 a:hover {
 	text-indent: -9999px;
 }
 
-#menu-rss:hover {
+#sidebar-header #menu-rss:hover {
 	background: url('header.png') -640px -158px;
 }
 
-#menu-shop {
+#sidebar-header #menu-shop {
 	height: 40px;
 	width: 80px;
 	display: block;
@@ -155,11 +155,11 @@ h2 a:hover, h3 a:hover {
 	text-indent: -9999px;
 }
 
-#menu-shop:hover {
+#sidebar-header #menu-shop:hover {
 	background: url('header.png') -700px -158px;
 }
 
-#menu-contact {
+#sidebar-header #menu-contact {
 	height: 40px;
 	width: 100px;
 	display: block;
@@ -168,7 +168,7 @@ h2 a:hover, h3 a:hover {
 	text-indent: -9999px;
 }
 
-#menu-contact:hover {
+#sidebar-header #menu-contact:hover {
 	background: url('header.png') -780px -158px;
 }
 
@@ -198,11 +198,33 @@ h2 a:hover, h3 a:hover {
 
 #sidebar-undercomic p {
 	padding: 5px;
-	margin-left: 30px;
-	margin-right: 30px;
 	background: #d6e1b4;
 	border: 1px solid #9bae5f;
 	text-align: center;
+	margin: 4px 30px;
+	font-size: 14px;
+}
+
+	#sidebar-undercomic .entry, #sidebar-undercomic .widget {
+		margin: 0;
+		padding: 0;
+	}
+	
+	#sidebar-undercomic .widget_comicpress_comic_date {
+		float: left;
+		width: 160px;
+		margin-left: 30px;
+	}
+
+	#sidebar-undercomic .widget_comicpress_comments {
+		width: 160px;
+		margin-right: 30px;
+		float: right;
+	}
+
+	#sidebar-menubar .widget {
+		margin: 0;
+		padding: 0;
 	}
 	
 .nav, #sidebar-undercomic .post-text, #sidebar-undercomic .post-extras {
@@ -606,19 +628,6 @@ ol.commentlist {
 	padding-left: 10px;
 }
 
-.widget_comicpress_comic_date {
-	float: left;
-	width: 160px;
-	margin-left: 20px;
-}
-
-.widget_comicpress_comments {
-	width: 160px;
-	margin-right: 20px;
-}
-
-.
-
 /* COMMENT LINK */
 
 .comment-link {
@@ -657,3 +666,26 @@ ol.commentlist {
 		font-size: 20px;
 		line-height: 30px;
 		}
+		
+	/* WIDGETS */
+
+.archive-dropdown-wrap {
+	background: url('browse-search.png') no-repeat;
+}
+
+	.archive-dropdown-wrap:hover {
+		background-position: 0 -23px;
+	}
+
+.archive-dropdown {
+	margin: 0;
+	padding: 0;
+	width: 166px;
+	height: 23px;
+	font-size: 12px;
+	font-family: 'Arial' , sans-serif;
+	border: none;
+	opacity: 0;
+	filter: alpha(opacity=0);
+	cursor: pointer;
+}

themepack/silver/notes.php

@@ -1,6 +1,6 @@
 <strong>ThemePack (default)</strong>: Silver<br />
 <strong>Author</strong>: ComicPress Development Team<br />
-<strong>Layouts</strong>: standard, 3c, gn, v, v3c<br />
+<strong>Version</strong>: 1.0.5
 <br />
 <strong>Installation Notes</strong>:<br />
 None.

themepack/silver/style.css

@@ -3,7 +3,7 @@ ThemePack Name: Silver
 ThemePack URI: http://comicpress.org
 Author: Tyler Martin
 Author URI: http://mindfaucet.com/
-Version: 0.1.0
+Version: 0.1.5
 */
 
 /* STANDARD TAGS */
@@ -15,7 +15,7 @@ body {
 	background: #fff url('background.png') top center repeat-x;
 }
 
-	.button {
+button {
 	background: #aaa url('menu.png');
 	color: #000;
 	font-family: 'Arial', sans-serif;
@@ -25,16 +25,11 @@ body {
 	cursor: pointer;
 }
 		
-	.button:hover {
+	button:hover {
 		color: #fff;
 		background: #f00 url('menu.png') 0 -75px;
 	}
 
-.narrowcolumn {
-	width: 560px;
-}
-
-
 /* THE HEADER */
 
 #header {
@@ -236,6 +231,7 @@ body {
 
 	.comment-link a {
 		color: #333;
+		padding: 0 5px 0 0;
 	}
 		
 	.comment-link a:hover {
@@ -246,7 +242,6 @@ body {
 		width: 30px;
 		height: 25px;
 		display: block;
-		margin: 0 0 0 5px;
 		float: right;
 		overflow: hidden;
 		text-align: center;

themepack/slickblack/notes.php

@@ -1,6 +1,5 @@
 <strong>ThemePack</strong>: slickblack<br />
 <strong>Author</strong>: Philip M. Hofer (Frumph)<br />
-<strong>Layouts</strong>: standard, 3c, gn, v, v3c<br />
 <br />
 <strong>Installation Notes</strong>:<br />
 None.

themepack/slickblack/style.css

@@ -18,10 +18,17 @@ body {
 	color: #ccc;
 }
 
-#header {width: 780px; height: 140px; background: url('header.png') top left no-repeat; overflow: hidden;}
+#header {
-#header h1 {padding: 0;}
+	text-align: left;
-#header h1 a {display: block; width: 980px; height: 140px; text-indent: -9999px;}
+}
-#header .description {display: none;}
+
+#header h1 a {
+	color: #fff;
+}
+
+#header h1 a:hover {
+	color: #fff000;
+}
 
 a {
 	color: #b4d3df;
@@ -55,7 +62,7 @@ h1, h1 a, h2, h2 a, h3, h3 a {
 	}
 
 #pagewrap-right {
-	width: 778px;
+	width: 768px;
 }
 
 #content-wrapper {
@@ -65,7 +72,7 @@ h1, h1 a, h2, h2 a, h3, h3 a {
 }
 
 .narrowcolumn {
-	width: 556px;
+	width: 546px;
 	background: #333;
 	border: solid 1px #000;
 }

widgets/archive-dropdown.php

@@ -4,7 +4,7 @@ Widget Name: comicpress archive dropdown
 Widget URI: http://comicpress.org/
 Description: 
 Author: Philip M. Hofer (Frumph)
-Version: 1.01
+Version: 1.04
 Author URI: http://webcomicplanet.com/
 
 */
@@ -13,11 +13,30 @@ function comicpress_archive_dropdown() { ?>
 	<div class="archive-dropdown-wrap">
 		<select name="archive-dropdown" class="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'> 
 		<option value=""><?php echo attribute_escape(__('Archives...','comicpress')); ?></option> 
-			<?php wp_get_archives('type=monthly&format=option&show_post_count=1'); ?> 
+			<?php wp_get_archives('type=monthly&format=option&show_post_count=-1'); ?> 
 		</select>
 	</div>
 <?php }
 
+function comicpress_archive_dropdown_comics() { 
+	global $post, $wp_query; 
+	$temp_post = $post; 
+	$temp_query = $wp_query;
+?>
+	<div class="archive-dropdown-wrap">
+		<select name="archive-dropdown" class="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'> 
+		<option value=""><?php echo attribute_escape(__('Archives...','comicpress')); ?></option> 
+				<?php $comicArchive = new WP_Query(); $comicArchive->query('showposts=-1&cat='.get_all_comic_categories_as_cat_string());
+				while ($comicArchive->have_posts()) : $comicArchive->the_post() ?>
+					<option value="<?php echo get_permalink($post->ID) ?>"><?php the_title() ?></option>
+				<?php endwhile; ?>
+		</select>
+	</div>
+	<?php
+	$post = $temp_post; $temp_post = null;
+	$wp_query = $temp_query; $temp_query = null;
+}
+
 class widget_comicpress_archive_dropdown extends WP_Widget {
 	
 	function widget_comicpress_archive_dropdown() {
@@ -26,27 +45,35 @@ class widget_comicpress_archive_dropdown extends WP_Widget {
 	}
 	
 	function widget($args, $instance) {
-		global $post;
 		extract($args, EXTR_SKIP); 
 		
 		echo $before_widget;
 		$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']); 
 		if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }; 
+		if ($instance['showcomicposts'] == 'on') {
+			comicpress_archive_dropdown_comics();
+		} else {
 			comicpress_archive_dropdown();
+		}
 		echo $after_widget;
 	}
 	
 	function update($new_instance, $old_instance) {
 		$instance = $old_instance;
 		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['showcomicposts'] = $new_instance['showcomicposts'];
 		return $instance;
 	}
 	
 	function form($instance) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
+		$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'showcomicposts' => 'off' ) );
 		$title = strip_tags($instance['title']);
+		$showcomicposts = $instance['showcomicposts']; if (empty($showcomicposts)) $showcomicposts = 'off';
 		?>
 		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo attribute_escape($title); ?>" /></label></p>
+		<p><label for="<?php echo $this->get_field_id('showcomicposts'); ?>"><strong><?php _e('Show individual comic posts?','comicpress'); ?></strong><br />
+		<input id="<?php echo $this->get_field_id('showcomicposts'); ?>" name="<?php echo $this->get_field_name('showcomicposts'); ?>" type="radio" value="on"<?php if ( $showcomicposts == "on") { echo " checked"; } ?> />On</label>&nbsp;<input id="<?php echo $this->get_field_id('showcomicposts'); ?>" name="<?php echo $this->get_field_name('showcomicposts'); ?>" type="radio" value="off"<?php if ( $showcomicposts == "off") { echo " checked"; } ?> />Off</label></p>
+
 		<?php
 	}
 }

widgets/bookmark.php

@@ -39,18 +39,11 @@ global $post, $wp_query;
 						gt = imgGotoOn;
 						ct = imgClearOn;
 					}
-					document.write('<div id="bmh" style="width: 173px; margin: 15px 0 0 0; padding: 5px; position: absolute; color: #eee; font-size: 11px; background-color:#222; border: 1px solid #ccc; visibility: hidden;"><strong>COMIC BOOKMARK</strong><br />Click "Tag Page" to bookmark a comic page. When you return to the site, click "Goto Tag" to continue where you left off.</div>');
+					document.write('<div id="bmh" style="width: 173px; margin: 15px 0 0 0; padding: 5px; position: absolute; color: #eee; font-size: 11px; background-color:#222; border: 1px solid #ccc; visibility: hidden;"><strong>BOOKMARK</strong><br />Click "Tag Page" to bookmark a page. When you return to the site, click "Goto Tag" to continue where you left off.</div>');
-					<?php if (is_home()) { ?>
 					document.write('<a href="#" onClick="bmhome();return false;"><img src="'+imgTag+'" alt="<?php __('Tag This Page','comicpress'); ?>" border="0"></a>');
 					document.write('<a href="#" onClick="gto();return false;"><img src="'+gt+'" alt="Goto Tag" border="0" id="gtc"></a>');
 					document.write('<a href="#" onClick="bmc();return false;"><img src="'+ct+'" alt="Clear Tag" border="0" id="rmc"></a>');
 					document.write('<a href="#" onMouseOver="document.getElementById(\'bmh\').style.visibility=\'visible\';" onMouseOut="document.getElementById(\'bmh\').style.visibility=\'hidden\';" onClick="return false;"><img src="'+imgInfo+'" alt="" border="0"></a>');
-					<?php } elseif (is_single() && in_comic_category()) { ?>
-						document.write('<a href="#" onClick="bm();return false;"><img src="'+imgTag+'" alt="Tag This Page" border="0"></a>');
-						document.write('<a href="#" onClick="gto();return false;"><img src="'+gt+'" alt="Goto Tag" border="0" id="gtc"></a>');
-						document.write('<a href="#" onClick="bmc();return false;"><img src="'+ct+'" alt="Clear Tag" border="0" id="rmc"></a>');
-						document.write('<a href="#" onMouseOver="document.getElementById(\'bmh\').style.visibility=\'visible\';" onMouseOut="document.getElementById(\'bmh\').style.visibility=\'hidden\';" onClick="return false;"><img src="'+imgInfo+'" alt="" border="0"></a>');
-					<?php } ?>
 				}
 
 				/* Below are our functions for this little script */
@@ -122,6 +115,7 @@ class widget_comicpress_bookmark extends WP_Widget {
 	
 	function widget($args, $instance) {
 		global $post, $wp_query;
+		if (is_home() || is_single()) { 
 			extract($args, EXTR_SKIP);
 			echo $before_widget;
 			$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']);
@@ -129,6 +123,7 @@ class widget_comicpress_bookmark extends WP_Widget {
 			comicpress_comic_bookmark();
 			echo $after_widget;
 		}
+	}
 	
 	function update($new_instance, $old_instance) {
 		$instance = $old_instance;

widgets/calendar.php

@@ -18,6 +18,7 @@ function comicpress_calendar($instance = null) {
 		$large = $instance['large'];
 	}
 	?>
+	<center>
 	<div id="wp-calendar-top"></div>
 	<div id="wp-calendar-wrap">
 	<?php if (!empty($thumbnail)) { ?>
@@ -31,8 +32,10 @@ function comicpress_calendar($instance = null) {
 	<?php get_calendar(); ?>
 	</div>
 	<div id="wp-calendar-bottom"></div>
+	</center>
 <?php }
 
+
 class widget_comicpress_calendar extends WP_Widget {
 	
 	function widget_comicpress_calendar() {

widgets/comiccomments.php

@@ -21,7 +21,7 @@ class widget_comicpress_comments extends WP_Widget {
 		extract($args, EXTR_SKIP); 
 		
 		echo $before_widget;
-		$title = empty($instance['title']) ? _('Permalink','comicpress') : apply_filters('widget_title', $instance['title']); ?>
+		$title = empty($instance['title']) ? __('Permalink','comicpress') : apply_filters('widget_title', $instance['title']); ?>
 		<?php if ('open' == $post->comment_status) { ?><div class="comment-link"><?php comments_popup_link('<span class="comment-balloon comment-balloon-empty">&rdquo;</span>Comment ', '<span class="comment-balloon">1</span>Comment ', '<span class="comment-balloon">%</span>Comment '); ?></div><?php } ?>
 		<?php
 		echo $after_widget;

widgets/graphical-navigation.php

@@ -35,71 +35,82 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 			
 			$prev_story = get_previous_storyline_start_permalink();
 			$next_story = get_next_storyline_start_permalink(); 
-			?>
 			
+			$latest_comic = get_permalink( get_terminal_post_in_category(get_all_comic_categories_as_cat_string(), false) );
+			?>
 			<div id="comic_navi_wrapper">
 			<table id="comic_navi" cellpadding="0" cellspacing="0"><tr><td>
-			<?php if ($instance['first'] != 'off') {
+			<?php if ($instance['first'] == 'on') {
 				if (!empty($first_comic) && ($first_comic != $this_permalink)) { ?>
 					<a href="<?php echo $first_comic; ?>" class="navi navi-first" title="<?php echo $instance['first_title']; ?>"><?php echo $instance['first_title']; ?></a>
 				<?php } else { ?>
 					<div class="navi navi-first navi-void"><?php echo $instance['first_title']; ?></div>
 				<?php } 
 			} 
-			if ($instance['story_prev'] != 'off') { 
+			if ($instance['story_prev'] == 'on') { 
 				if (!empty($prev_story)) { ?>
 					<a href="<?php echo $prev_story; ?>" class="navi navi-prevchap" title="<?php echo $instance['story_prev_title']; ?>"><?php echo $instance['story_prev_title']; ?></a>
 				<?php } else { ?>
 					<div class="navi navi-prevchap navi-void"><?php echo $instance['story_prev_title']; ?></div>
 				<?php } 
 			} 
-			if ($instance['previous'] != 'off') {
+			if ($instance['previous'] == 'on') {
 				if (!empty($prev_comic)) { ?>
 					<a href="<?php echo $prev_comic; ?>" class="navi navi-prev" title="<?php echo $instance['previous_title']; ?>"><?php echo $instance['previous_title']; ?></a>
 				<?php } else { ?>
 					<div class="navi navi-prev navi-void"><?php echo $instance['previous_title']; ?></div>
 				<?php } 
 			}
-			if ($instance['archives'] != 'off' && !empty($instance['archive_path'])) { ?>
+			if ($instance['archives'] == 'on' && !empty($instance['archive_path'])) { ?>
 				<a href="<?php echo $instance['archive_path']; ?>" class="navi navi-archive" title="<?php echo $instance['archives_title']; ?>"><?php echo $instance['archives_title']; ?></a>
 			<?php } 
-			if ($instance['random'] != 'off') { ?>
+			if ($instance['random'] == 'on') { ?>
 				<a href="<?php echo bloginfo('url'); ?>/?randomcomic" class="navi navi-random" title="<?php echo $instance['random_title']; ?>"><?php echo $instance['random_title']; ?></a>
 			<?php }
-			if ($instance['comictitle'] != 'off') { ?>
+			if ($instance['comictitle'] == 'on') { ?>
-				<div class="navi-comictitle"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></div>
+				<div class="navi-comictitle"><a href="<?php the_permalink(); ?>">"<?php the_title(); ?>"</a></div>
 			<?php } 
-			if ($instance['comments'] != 'off') { ?>
+			if ($instance['comments'] == 'on') { ?>
 				<a href="<?php the_permalink(); ?>#comment" class="navi navi-comments" title="<?php echo $instance['comments_title']; ?>"><span class="navi-comments-count"><?php comments_number('0', '1', '%'); ?></span><?php echo $instance['comments_title']; ?></a>
 			<?php }
-			if ($instance['buyprint'] != 'off') { ?>	
+			if ($instance['buyprint'] == 'on') { ?>	
 				<form method="post" title="<?php echo $instance['buyprint_title']; ?>" action="<?php global $buy_print_url; echo $buy_print_url; ?>" class="navi-buyprint-form"> 
 				<input type="hidden" name="comic" value="<?php echo get_the_ID(); ?>" /> 
-				<button class="navi navi-buyprint" type="submit" value="submit"><?php echo $instance['buyprint_title']; ?></button> 
+				<button class="navi navi-buyprint" type="submit" value="buyprint"><?php echo $instance['buyprint_title']; ?></button> 
 				</form> 
 			<?php } 	
-			if ($instance['next'] != 'off') {
+			if ($instance['next'] == 'on') {
-				if (!empty($next_comic)) { ?>
+				if (!empty($next_comic)) {
+					if (($next_comic == $latest_comic) && $instance['nextgohome'] == 'on') { ?>
+						<a href="/" class="navi navi-next" title="<?php echo $instance['next_title']; ?>"><?php echo $instance['next_title']; ?></a>
+					<?php } else { ?>
 						<a href="<?php echo $next_comic; ?>" class="navi navi-next" title="<?php echo $instance['next_title']; ?>"><?php echo $instance['next_title']; ?></a>					
+					<?php } ?>
 				<?php } else { ?>
 					<div class="navi navi-next navi-void"><?php echo $instance['next_title']; ?></div>
 				<?php }
 			} 
-			if ($instance['story_next'] != 'off') { 
+			if ($instance['story_next'] == 'on') { 
 				if (!empty($next_story) && !is_home()) { ?>
 					<a href="<?php echo $next_story; ?>" class="navi navi-nextchap" title="<?php echo $instance['story_next_title']; ?>"><?php echo $instance['story_next_title']; ?></a>
 				<?php } else { ?>
 					<div class="navi navi-nextchap navi-void"><?php echo $instance['story_next_title']; ?></div>
 				<?php }
 			}
-			if ($instance['last'] != 'off') {
+			if ($instance['last'] == 'on') {
-				if (!empty($last_comic) && ($last_comic != $this_permalink)) { ?>
+				if (!empty($last_comic) && ($last_comic != $this_permalink)) {
+					if ($instance['nextgohome'] == 'on') { ?>
+						<a href="/" class="navi navi-last" title="<?php echo $instance['last_title']; ?>"><?php echo $instance['last_title']; ?></a>
+					<?php } else { ?>
 						<a href="<?php echo $last_comic; ?>" class="navi navi-last" title="<?php echo $instance['last_title']; ?>"><?php echo $instance['last_title']; ?></a>						
+					<?php } ?>
 				<?php } else { ?>
 					<div class="navi navi-last navi-void"><?php echo $instance['last_title']; ?></div>
 				<?php }
 			} ?>
-			</td></tr></table>
+			</td>
+			</tr>
+			</table>
 			</div>
 			
 		<?php } 
@@ -119,6 +130,7 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		$instance['archive_path'] = strip_tags($new_instance['archive_path']);
 		$instance['buyprint'] = $new_instance['buyprint'];
 		$instance['comictitle'] = $new_instance['comictitle'];
+		$instance['nextgohome'] = $new_instance['nextgohome'];
 		
 		$instance['first_title'] = strip_tags($new_instance['first_title']);
 		$instance['last_title'] = strip_tags($new_instance['last_title']);
@@ -156,7 +168,8 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 					'comments_title' => 'Comments', 
 					'next_title' => 'Next', 
 					'buyprint_title' => 'Buy Print',
-					'comictitle' => 'off'
+					'comictitle' => 'off',
+					'nextgohome' => 'off',
 		 ) );
 		$first = $instance['first']; if (empty($first)) $first = 'on';
 		$last = $instance['last']; if (empty($last)) $last = 'on';
@@ -170,6 +183,7 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		$next = $instance['next']; if (empty($next)) $next = 'on';
 		$buyprint = $instance['buyprint']; if (empty($buyprint)) $buyprint = 'off';
 		$comictitle = $instance['comictitle']; if (empty($comictitle)) $comictitle = 'off';
+		$nextgohome = $instance['nextgohome']; if (empty($nextgohome)) $nextgohome = 'off';
 		
 				
 		$first_title = $instance['first_title']; 
@@ -252,7 +266,9 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		<input id="<?php echo $this->get_field_id('buyprint'); ?>" name="<?php echo $this->get_field_name('buyprint'); ?>" type="radio" value="on"<?php if ( $buyprint == "on") { echo " checked"; } ?> />On</label>&nbsp;<input id="<?php echo $this->get_field_id('buyprint'); ?>" name="<?php echo $this->get_field_name('buyprint'); ?>" type="radio" value="off"<?php if ( $buyprint == "off") { echo " checked"; } ?> />Off</label><br />
 		Title:<br />
 		<input class="widefat" id="<?php echo $this->get_field_id('buyprint_title'); ?>" name="<?php echo $this->get_field_name('buyprint_title'); ?>" type="text" value="<?php echo attribute_escape($buyprint_title); ?>" /></label><br />
-		
+		<hr>
+			<?php _e('Next to Last, and latest Button goes home?','comicpress'); ?><br />
+			<input id="<?php echo $this->get_field_id('nextgohome'); ?>" name="<?php echo $this->get_field_name('nextgohome'); ?>" type="radio" value="on"<?php if ( $nextgohome == "on") { echo " checked"; } ?> />On</label>&nbsp;<input id="<?php echo $this->get_field_id('nextgohome'); ?>" name="<?php echo $this->get_field_name('nextgohome'); ?>" type="radio" value="off"<?php if ( $nextgohome == "off") { echo " checked"; } ?> />Off</label><br />
 
 		<?php
 	}

widgets/latestcomicjump.php

@@ -12,7 +12,7 @@ Author URI: http://webcomicplanet.com/
 if ( isset( $_GET['latestcomic'] ) )
 	add_action( 'template_redirect', 'latest_comic_jump' );
 
-//Generate a random comic page - to use simply create a URL link to "/?randomcomic"
+//to use simply create a URL link to "/?latestcomic"
 function latest_comic_jump() {
 	wp_redirect( get_permalink( get_terminal_post_in_category(get_all_comic_categories_as_cat_string(), false) ) );
 	exit;

widgets/menubar.php

@@ -12,9 +12,9 @@ Author URI: http://webcomicplanet.com/
 
 function comicpress_menubar() {
 global $contact_in_menubar,$enable_search_in_menubar,$enable_rss_in_menubar,$enable_navigation_in_menubar,$disable_dynamic_menubar_links, $themepack_directory;
-	if (comicpress_check_themepack_file('menubar.php') == false) {
+	if (comicpress_check_themepack_file('menubar') == false) {
-		if (function_exists('suckerfish')) { 
+		if (file_exists(get_template_directory() . '/custom-menubar.php')) {
-			suckerfish();
+			include(get_template_directory() . '/custom-menubar.php');
 		} else { ?>
 		<div id="menubar">
 			

widgets/social.php

@@ -0,0 +1,95 @@
+<?php
+/*
+Widget Name: ComicPress Social
+Widget URI: http://comicpress.org/
+Description: Translates a user's URL line into a social widget, associating it to images.
+Author: Philip M. Hofer (Frumph)
+Version: 1.01
+Author URI: http://webcomicplanet.com/
+
+*/
+
+class widget_comicpress_social extends WP_Widget {
+	
+	function widget_comicpress_social() {
+		$widget_ops = array('classname' => 'widget_comicpress_social', 'description' => __('Display a user defined social button, with translated URL','comicpress') );
+		$this->WP_Widget('social', __('ComicPress Social','comicpress'), $widget_ops);
+	}
+	
+	function widget($args, $instance) {
+		global $post;
+		extract($args, EXTR_SKIP); 
+		
+		/* Get the info necessary */		
+		$permalink = get_permalink($post->ID);
+		$posttitle = $post->post_title;
+		$posttitle = str_replace(' ', '%20', $posttitle);
+		$title = $instance['title'];
+		if (empty($title)) $title = $posttitle;
+
+		$rss = get_bloginfo('rss2_url');
+		$blogname = urlencode(get_bloginfo('name')." ".get_bloginfo('description'));
+		// Grab the excerpt, if there is no excerpt, create one
+		$excerpt = urlencode(strip_tags(strip_shortcodes($post->post_excerpt)));
+		if ($excerpt == "") {
+			$excerpt = urlencode(substr(strip_tags(strip_shortcodes($post->post_content)),0,250));
+		}
+		// Clean the excerpt for use with links
+		$excerpt	= str_replace('+','%20',$excerpt);
+		
+		echo $before_widget; 
+		$url = $instance['urlstr'];
+		$url = str_replace('[URL]', $permalink, $url);
+		$url = str_replace('[TITLE]', $posttitle, $url);
+		$url = str_replace('[RSS]', $rss, $url);
+		$url = str_replace('[BLOGNAME]', $blogname, $url);
+		$url = str_replace('[EXCERPT]', $excerpt, $url); ?>
+		
+		<div class="social-<?php echo sanitize_title($title); ?>">
+		<?php if (!empty($instance['image'])) { ?>
+			<a href="<?php echo $url; ?>" target="_blank" class="social-<?php echo sanitize_title($title); ?>"><img src="<?php echo $instance['image']; ?>" alt="<?php echo $title; ?>" /></a>
+		<?php } else { ?>
+			<a href="<?php echo $url; ?>" target="_blank" class="social-<?php echo sanitize_title($title); ?>"><?php echo $title; ?></a>		
+		<?php } ?>
+		</div>
+		<?php echo $after_widget;
+	}
+	
+	function update($new_instance, $old_instance) {
+		$instance = $old_instance;
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['urlstr'] = strip_tags($new_instance['urlstr']);
+		$instance['image'] = strip_tags($new_instance['image']);
+		return $instance;
+	}
+	
+	function form($instance) {
+		$instance = wp_parse_args( (array) $instance, array( 'title' => 'Share This!', 'urlstr' => '', 'image' => '') );
+		$title = strip_tags($instance['title']);
+		if (empty($title)) $title = 'Share This!';
+		$urlstr = strip_tags($instance['urlstr']);
+		$image = strip_tags($instance['image']);
+		?>
+		<small>
+		<strong>Translated Strings:</strong> [URL] [TITLE] [RSS] [BLOGNAME] [EXCERPT]<br />
+		<strong>Examples:</strong><br />
+		http://twitter.com/home?status=[TITLE]%20-%20[URL]<br />
+		http://www.stumbleupon.com/submit?url=[URL]&amp;title=[TITLE]<br />
+		</small>
+		<br />
+		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title (used as CSS marker too):','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo attribute_escape($title); ?>" /></label></p>
+		<p><label for="<?php echo $this->get_field_id('urlstr'); ?>"><?php _e('URL','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('urlstr'); ?>" name="<?php echo $this->get_field_name('urlstr'); ?>" type="text" value="<?php echo attribute_escape($urlstr); ?>" /></label></p>
+		<p><label for="<?php echo $this->get_field_id('image'); ?>"><?php _e('Image','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('image'); ?>" name="<?php echo $this->get_field_name('image'); ?>" type="text" value="<?php echo attribute_escape($image); ?>" /></label></p>
+		<?php
+	}
+}
+register_widget('widget_comicpress_social');
+
+
+function widget_comicpress_social_init() {    
+	new widget_comicpress_social(); 
+} 
+
+add_action('widgets_init', 'widget_comicpress_social_init');
+
+?>