2.8.1.21

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

archive-comic-storyline-thumbs.php

@@ -30,8 +30,8 @@ Template Name: Comic Storyline with Thumbs
 			$first_comic_in_category = get_terminal_post_in_category($category_id,true);
 			$first_comic_permalink = get_permalink($first_comic_in_category->ID);
 			$archive_image = null;
-			foreach (array("archive", "rss", "comic") as $type) {
+			foreach (array("mini", "archive", "rss", "comic") as $type) {
-				if (($requested_archive_image = get_comic_url("archive", $first_comic_in_category)) !== false) {
+				if (($requested_archive_image = get_comic_url($type, $first_comic_in_category)) !== false) {
 					$archive_image = $requested_archive_image; break;
 				}
 			}

archive-comic-storyline.php

@@ -30,8 +30,8 @@ Template Name: Comic Storyline Archive
 						$first_comic_in_category = get_terminal_post_in_category($category_id);
 						$first_comic_permalink = get_permalink($first_comic_in_category->ID);
 						$archive_image = null;
-						foreach (array("archive", "rss", "comic") as $type) {
+						foreach (array("mini", "archive", "rss", "comic") as $type) {
-							if (($requested_archive_image = get_comic_url("archive", $first_comic_in_category)) !== false) {
+							if (($requested_archive_image = get_comic_url($type, $first_comic_in_category)) !== false) {
 								$archive_image = $requested_archive_image; break;
 							}
 						}

archive.php

@@ -50,7 +50,7 @@
 
 				<div class="comicthumbwrap">
 					<div class="comicarchiveframe">
-						<a href="<?php the_permalink() ?>"><img src="<?php the_comic_archive() ?>" 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><br />
 					</div>
 				</div>
 

blog.php

@@ -6,20 +6,48 @@ Template Name: Blog
 <?php get_header();  ?>
 <?php include(get_template_directory() . '/layout-head.php'); ?>
 	
-	<?php if (have_posts()): 
+	<?php global $blog_postcount;
-
+	if ($split_column_in_two != 'yes') {
-		$blog_query = '&cat=-"'.exclude_comic_categories().'"&paged='.$paged; 
+		$blog_query = 'showposts='.$blog_postcount.'&cat="-'.exclude_comic_categories().'"&paged='.$paged; 
 		
 		$posts = query_posts($blog_query);
+		if (have_posts()) {
+			
 			while (have_posts()) : the_post();
 				
 				display_blog_post();	
 			
 			endwhile;
 			
+		}
 		comicpress_pagination();
-			
+	} else { ?>
-	endif; ?>
+	<div id="dualcolumns">
+		<div class="column_one">
+			<div class="column_one_header"></div>
+	<?php $blog_query = 'showposts='.$blog_postcount.'&cat="-'.exclude_comic_categories().'"&author='.$author_column_one.'&paged='.$paged; 
+	$posts = query_posts($blog_query);
+	if (have_posts()) {
+		while (have_posts()) : the_post();
+			display_blog_post();	
+		endwhile;
+			} ?>
+			<span class="viewpostsbyone">View all posts by: <?php the_author_posts_link(); ?><span><br />
+		</div>
+		<div class="column_two">
+			<div class="column_two_header"></div>
+	<?php $blog_query = 'showposts='.$blog_postcount.'&cat="-'.exclude_comic_categories().'"&author='.$author_column_two; 
+	$posts = query_posts($blog_query);
+	if (have_posts()) {
+		while (have_posts()) : the_post();
+			display_blog_post();	
+		endwhile;
+			} ?>
+			<span class="viewpostsbytwo">View all posts by: <?php the_author_posts_link(); ?></span><br />
+		</div>
+		<div class="clear"></div>
+	</div>
+	<?php } ?>
 		<?php get_sidebar('underblog'); ?>
 		</div>
 	</div>

comicpress-config.php

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

comicpress-options-config.php

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

comments.php

@@ -8,7 +8,7 @@ if ( post_password_required() ) { ?>
 	return;
 } ?>
 
-<div <?php comment_class(); ?>>
+<div id="comment-wrapper">
 
 <?php if ( have_comments() ) : ?>
 
@@ -22,7 +22,7 @@ if ( post_password_required() ) { ?>
 		if (function_exists('comicpress_comments_callback')) { 
 			wp_list_comments(array(
 						'type' => 'comment',
-						'reply_text' => _('Reply to %s&not;','comicpress'), 
+						'reply_text' => __('Reply to %s&not;','comicpress'), 
 						'callback' => 'comicpress_comments_callback',
 						'end-callback' => 'comicpress_comments_end_callback',
 						'avatar_size'=>64

functions.php

@@ -16,14 +16,7 @@ if (function_exists('id_get_comment_number')) {
 	remove_filter('comments_number','id_get_comment_number');
 }
 
-$comicpress_version = '2.8.1.18';
+$comicpress_version = '2.8.1.21';
-
-// Remove the wptexturizer from changing the quotes and squotes.
-// remove_filter('the_content', 'wpautop');
-// remove_filter('the_title', 'wptexturize');
-remove_filter('the_content', 'wptexturize');
-// remove_filter('the_excerpt', 'wptexturize');
-// remove_filter('comment_text', 'wptexturize');
 
 global $wpmu_version;
 if (!empty($wpmu_version)) {
@@ -49,7 +42,7 @@ if (!empty($wpmu_version)) {
 	}
 	
 } else {
-	require_once(get_template_directory() . '/comicpress-config.php');
+	require(get_template_directory() . '/comicpress-config.php');
 }
 
 if (get_option('upload_path') !== false) {
@@ -105,7 +98,8 @@ if (get_option('upload_path') !== false) {
 				'blogposts_with_comic'			=> 'blogposts_with_comic',
 				'split_column_in_two'			=> 'split_column_in_two',
 				'author_column_one'				=> 'author_column_one',
-				'author_column_two'				=> 'author_column_two' ) as $options => $variable_name) {
+				'author_column_two'				=> 'author_column_two',
+				'remove_wptexturize'			=> 'remove_wptexturize' ) as $options => $variable_name) {
 		$variables_to_extract[$variable_name] = get_option("comicpress-${options}");
 	}
 	
@@ -132,6 +126,15 @@ global $cp_theme_layout;
 	return false;
 }
 
+if ($remove_wptexturize == 'yes') {
+	// Remove the wptexturizer from changing the quotes and squotes.
+	// remove_filter('the_content', 'wpautop');
+	// remove_filter('the_title', 'wptexturize');
+	remove_filter('the_content', 'wptexturize');
+	// remove_filter('the_excerpt', 'wptexturize');
+	// remove_filter('comment_text', 'wptexturize');
+}
+
 // WIDGETS WP 2.8 compatible ONLY, no backwards compatibility here.
 foreach (glob(dirname(__FILE__) . '/widgets/*.php') as $__file) { require_once($__file); }
 
@@ -382,7 +385,7 @@ function get_adjacent_storyline_category_id($next = false) {
 */
 
 function get_comic_path($folder = 'comic', $override_post = null, $filter = 'default', $multi = null) {
-	global $post, $comic_filename_filters, $comic_folder, $archive_comic_folder, $rss_comic_folder, $comic_pathfinding_errors, $wpmu_version;
+	global $post, $comic_filename_filters, $comic_folder, $archive_comic_folder, $rss_comic_folder, $mini_comic_folder, $comic_pathfinding_errors, $wpmu_version;
 
 	if (isset($comic_filename_filters[$filter])) {
 		$filter_to_use = $comic_filename_filters[$filter];
@@ -391,9 +394,9 @@ function get_comic_path($folder = 'comic', $override_post = null, $filter = 'def
 	}
 
 	switch ($folder) {
-		case "mini": $folder_to_user = $mini_comic_folder; break;
 		case "rss": $folder_to_use = $rss_comic_folder; break;
 		case "archive": $folder_to_use = $archive_comic_folder; break;
+		case "mini": $folder_to_use = $mini_comic_folder; break;
 		case "comic": default: $folder_to_use = $comic_folder; break;
 	}
 
@@ -441,12 +444,10 @@ function get_comic_url($folder = 'comic', $override_post = null, $filter = 'defa
 	if (($result = get_comic_path($folder, $override_post, $filter)) !== false) {
 		return get_option('home') . '/' . $result;
 	} else {
-		if (($folder == 'archive' || $folder == 'rss' || $folder == 'mini')) {
 		if (($result = get_comic_path('comic', $override_post, $filter)) !== false) {
 			return get_option('home') . '/' . $result; 
 		}
 	}
-	}
 	return false;
 }
 
@@ -707,19 +708,71 @@ add_filter('the_content','insert_comic_feed');
 // Register Sidebar and Define Widgets
 
 if ( function_exists('register_sidebar') ) {
-	register_sidebar(array('name'=>'Left Sidebar','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+	register_sidebar(array('name'=>'Left Sidebar','before_widget' => '
-	register_sidebar(array('name'=>'Right Sidebar','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+	<div id="%1$s" class="widget %2$s">
-	register_sidebar(array('name'=>'Above Header','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+','after_widget'  => '
-	register_sidebar(array('name'=>'Header','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
-	register_sidebar(array('name'=>'Menubar','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+' ));
-	register_sidebar(array('name'=>'Over Comic','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+	register_sidebar(array('name'=>'Right Sidebar','before_widget' => '
-	register_sidebar(array('name'=>'Left of Comic','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+	<div id="%1$s" class="widget %2$s">
-	register_sidebar(array('name'=>'Right of Comic','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+','after_widget'  => '
-	register_sidebar(array('name'=>'Under Comic','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
-	register_sidebar(array('name'=>'Over Blog','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+' ));
-	register_sidebar(array('name'=>'Blog','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+	register_sidebar(array('name'=>'Above Header','before_widget' => '
-	register_sidebar(array('name'=>'Under Blog','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+	<div id="%1$s" class="widget %2$s">
-	register_sidebar(array('name'=>'Footer','before_widget' => '<ul><li id="%1$s" class="widget %2$s">','after_widget'  => '</li></ul>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>' ));
+','after_widget'  => '
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
+' ));
+	register_sidebar(array('name'=>'Header','before_widget' => '
+	<div id="%1$s" class="widget %2$s">
+','after_widget'  => '
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
+' ));
+	register_sidebar(array('name'=>'Menubar','before_widget' => '
+	<div id="%1$s" class="widget %2$s">
+','after_widget'  => '
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
+' ));
+	register_sidebar(array('name'=>'Over Comic','before_widget' => '
+	<div id="%1$s" class="widget %2$s">
+','after_widget'  => '
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
+' ));
+	register_sidebar(array('name'=>'Left of Comic','before_widget' => '
+	<div id="%1$s" class="widget %2$s">
+','after_widget'  => '
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
+' ));
+	register_sidebar(array('name'=>'Right of Comic','before_widget' => '
+	<div id="%1$s" class="widget %2$s">
+','after_widget'  => '
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
+' ));
+	register_sidebar(array('name'=>'Under Comic','before_widget' => '
+	<div id="%1$s" class="widget %2$s">
+','after_widget'  => '
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
+' ));
+	register_sidebar(array('name'=>'Over Blog','before_widget' => '
+	<div id="%1$s" class="widget %2$s">
+','after_widget'  => '
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
+' ));
+	register_sidebar(array('name'=>'Blog','before_widget' => '
+	<div id="%1$s" class="widget %2$s">
+','after_widget'  => '
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
+' ));
+	register_sidebar(array('name'=>'Under Blog','before_widget' => '
+	<div id="%1$s" class="widget %2$s">
+','after_widget'  => '
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
+' ));
+	register_sidebar(array('name'=>'Footer','before_widget' => '
+	<div id="%1$s" class="widget %2$s">
+','after_widget'  => '
+</div>','before_title'  => '<h2 class="widgettitle">', 'after_title'   => '</h2>
+' ));
 }     
 
 function storyline_category_list() {

functions/avatars.php

@@ -11,6 +11,7 @@
  * @return string <img> tag for the user's avatar
 */
 function comicpress_get_avatar( $id_or_email, $size = '64', $alt = false) {
+	global $avatar_directory;
 	if ( ! get_option('show_avatars') )
 		return false;
 
@@ -44,16 +45,15 @@ function comicpress_get_avatar( $id_or_email, $size = '64', $alt = false) {
 		$email = $id_or_email;
 	}
 	
+	if ($avatar_directory != 'none' || empty($default)) $default = comicpress_random_default_avatar((string)$id_or_email);
+		
 	if ( empty($default) ) {
-		$default = comicpress_random_default_avatar((string)$id_or_email);
-		if ( empty($default) || $default == 'none' ) {
 		$avatar_default = get_option('avatar_default');
 		if ( empty($avatar_default) )
 			$default = 'mystery';
 		else
 			$default = $avatar_default;	
 	}
-	}
 
 	if ( 'mystery' == $default )
 		$default = "http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
@@ -88,6 +88,7 @@ function comicpress_get_avatar( $id_or_email, $size = '64', $alt = false) {
 
 function comicpress_random_default_avatar($id_or_email = '') {
 	$current_avatar_directory = get_option('comicpress-avatar_directory');
+	
 	if (empty($current_avatar_directory)) $current_avatar_directory = 'default';
 	
 	$count = count($results = glob(get_template_directory() . '/images/avatars/'.$current_avatar_directory.'/*'));

functions/membersonly.php

@@ -47,10 +47,10 @@ function comicpress_members_filter($query) {
 
 function shortcode_for_comicpress_members_only( $atts, $content = null ) {
 	global $post, $userdata, $profileuser, $current_user, $errormsg;
-	$returninfo = '<div class="non-member">'.__('There is Members Only content here. To view this content you need to be a member of this site.','comicpress').'</div>';
+	$returninfo = '<div class="non-member">'.__('There is Members Only content here.<br />To view this content you need to be a member of this site.','comicpress').'</div>';
 	if ( !empty($current_user->ID) ) {
 		$is_member = get_usermeta($current_user->ID,'comicpress-is-member');
-		if ( ( $is_member == 'yes' ) ) {
+		if ($is_member == 'yes' || current_user_can('publish_posts')) {
 			$returninfo = '<div class="members-only">'.$content.'</div>';
 		}
 	}
@@ -109,10 +109,10 @@ function in_members_category() {
 }
 
 function comicpress_is_member() {
-	global $current_user;
+	global $user_ID;
-	if (!empty($current_user)) {
+	if (!empty($user_ID)) {
-		$is_member = get_usermeta($current_user->ID,'comicpress-is-member');
+		$is_member = get_usermeta($user_ID,'comicpress-is-member');
-		if ($is_member == 'yes' || current_user_can('publish_post')) {
+		if ($is_member == 'yes' || current_user_can('publish_posts')) {
 			return true;
 		}
 	}

header.php

@@ -66,12 +66,9 @@ if (comicpress_check_themepack_file('header.php') == false) { ?>
 			<?php the_project_wonderful_ad('header'); ?>
 		</div>
 	<?php } ?>
-	<?php if (!comicpress_is_active_sidebar('Header')) { ?>
 		<h1><a href="<?php echo get_settings('home') ?>"><?php bloginfo('name') ?></a></h1>
 		<div class="description"><?php bloginfo('description') ?></div>
-	<?php } else { ?>
 		<?php get_sidebar('header'); ?>
-	<?php } ?>
 	<div class="clear"></div>
 </div>
 <?php } ?>

images/nav/default/navstyle.css

@@ -10,6 +10,15 @@ Style: Default
 	display: table;
 	border-collapse: collapse;
 	margin: 0 auto;
+
+}
+
+.navi-comictitle {
+	text-align: center;
+	float: left;
+	display: block;
+	padding-top: 26px;
+	max-width: 200px;
 }
 
 .navi {

images/nav/scifi/navstyle.css

@@ -13,6 +13,13 @@ Style: Sci Fi
 	margin: 0 auto;
 }
 
+.navi-comictitle {
+	text-align: center;
+	float: left;
+	display: inline-block;
+	padding-top: 26px;
+}
+
 .navi {
 	width: 60px;
 	padding: 56px 0 0 0;

index.php

@@ -21,6 +21,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) { ?>
+			<div id="comic-wrap">
 				<div id="comic-head"><?php get_sidebar('over'); ?></div>
 				<div class="clear"></div>
 				<?php get_sidebar('comicleft'); ?>
@@ -28,6 +29,7 @@
 				<?php get_sidebar('comicright'); ?>
 				<div class="clear"></div>
 				<div id="comic-foot"><?php get_sidebar('under'); ?></div>
+			</div>
 			<?php } ?>
 		<?php endwhile; ?>
 		
@@ -84,7 +86,9 @@ if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes'
 		}
 		comicpress_pagination();
 	} else { ?>
+	<div id="dualcolumns">
 		<div class="column_one">
+			<div class="column_one_header"></div>
 		<?php $blog_query = 'showposts='.$blog_postcount.'&cat="-'.exclude_comic_categories().'"&author='.$author_column_one.'&paged='.$paged; 
 		$posts = query_posts($blog_query);
 		if (have_posts()) {
@@ -95,6 +99,7 @@ if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes'
 			<span class="viewpostsbyone">View all posts by: <?php the_author_posts_link(); ?><span><br />
 		</div>
 		<div class="column_two">
+			<div class="column_two_header"></div>
 		<?php $blog_query = 'showposts='.$blog_postcount.'&cat="-'.exclude_comic_categories().'"&author='.$author_column_two; 
 		$posts = query_posts($blog_query);
 		if (have_posts()) {
@@ -105,6 +110,7 @@ if ($disable_comic_frontpage != 'yes' && $disable_comic_blog_frontpage != 'yes'
 			<span class="viewpostsbytwo">View all posts by: <?php the_author_posts_link(); ?></span><br />
 		</div>
 		<div class="clear"></div>
+	</div>
 	<?php } 
 } ?>
 

options/postoptions.php

@@ -237,6 +237,18 @@
 				</td>
 				</tr>
 				
+				<?php break;
+			case "comicpress-remove_wptexturize": ?>
+				<tr>
+				<th scope="row"><strong><?php _e('Remove WPs texturization from the content area?','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">
+				</td>
+				</tr>
 				<?php break;
 		}
 	}

sidebar-left.php

@@ -6,12 +6,8 @@ if ($disable_lrsidebars_frontpage == 'yes' && is_home()) {
 	<div class="sidebar-content">
 		<div class="sidebar">
 			<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Left Sidebar') ) : ?> 
-				<ul>
-					<li>
 				<?php $default_image = get_bloginfo('stylesheet_directory').'/images/cal/default.png'; ?>
 				<?php comicpress_calendar(array('thumbnail' => $default_image)) ?>
-					</li>
-				</ul>
 				<?php comicpress_archive_dropdown(); ?>
 				<?php comicpress_latest_comics() ?>
 			<?php endif; ?>

style.css

@@ -459,14 +459,6 @@ a.navi-comments:hover span {
 	margin: 0;
 }
 
-/* Wraps the content area w/comic */
-#content-wrapper {
-}
-
-/* wraps the content area */
-#subcontent-wrapper {
-}
-
 #content {
 	float: left;
 }
@@ -491,11 +483,20 @@ a.navi-comments:hover span {
 		padding: 1%; 
 	}
 	
+		.column_one_header {
+			padding: 5px;
+			border-top: solid 1px #c45253;
+		}
+	
 	.column_two {
 		width: 48%; 
 		float: left; 
 		padding: 1%; 
 	}
+		.column_two_header {
+			padding: 5px;
+			border-top: solid 1px #c45253;
+		}
 
 .post, .post-comic, .post-page {
 	clear: both;
@@ -620,28 +621,11 @@ a.navi-comments:hover span {
 /* COMMENT LINK */
 
 .comment-link {
-	height: 25px;
-	line-height: 20px;
 	font-family: 'Arial', sans-serif;
 	font-weight: bold;
 	text-align: right;
 }
 
-	.comment-link a {
-	}
-		
-	.comment-link a:hover {
-	}
-		
-	.comment-balloon {
-	}
-	
-		.comment-link a:hover .comment-balloon {
-		}
-		
-	.comment-balloon-empty {
-		}
-
 /* THE BLOG HEADER */
 
 #blogheader {
@@ -655,11 +639,12 @@ a.navi-comments:hover span {
 
 /* COMMENTS */
 
-.comment-wrap {
+#comment-wrapper {
+	margin-top: 5px;
 	padding: 0 20px;
 }
 
-.comment-wrap h3 {
+#comment-wrapper h3 {
 	margin: 0;
 	padding: 20px 0 0 0;
 	font-weight: normal;
@@ -763,12 +748,17 @@ ul.children {
 
 .comicthumbwrap {
 	float: left;
-	width: 120px;
+	max-width: 120px;
-	height: 130px;
+	max-height: 130px;
 	overflow: hidden;
 	margin: 2px 2px 6px 2px;
 }
 
+.comicthumbwrap img {
+	width: 120px;
+	max-height: 130px;
+}
+
 .comicarchiveframe {
 	padding: 5px;
 	border: 1px solid #000;
@@ -831,52 +821,35 @@ 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;
 	}
 	
 	.sidebar ul {
-		margin: 0 0 10px 0;
-		padding: 0;
-		list-style: none;
-	}
-	
-	.sidebar ul li ul {
 		margin: 0;
-	}
-
-		.sidebar ul li {
-			margin: 0;
-			padding: 0;
-			text-align: left;
 		list-style: none;
+		padding: 0;
 	}
 	
 	.sidebar ul li ul li {
-			margin: 0 0 0 13px;
+		margin: 0;
-			padding: 0;
+		padding-left: 14px;
-			text-align: left;
 	}
 
-	.sidebar li h2 {
+	.sidebar .widget {
-		margin-top: 10px;
+		margin: 10px 0;
+	}
+	
+	.sidebar .widget .post-extras, .sidebar .widget .entry {
+		padding: 3px;
 	}
 	
 /* WIDGETS */
 
-
+.random-comic-icon, .random-post-icon {
-.widget {
-	margin: 0 auto;
-}
-
-	.widget_comicpress_comictitle {
-		font-size: 36px;
-		font-family: georgia;
-		letter-spacing: -2px;
-		text-align: center;
-	}
-
-.random-comic-icon {
 	padding: 0 5px;
 	color: #fff;
 	background: #000;
@@ -889,9 +862,7 @@ ul.children {
 }
 
 .archive-dropdown-wrap {
-}
+	margin: 10px 0;
-
-	.archive-dropdown-wrap:hover {
 }
 
 .archive-dropdown {
@@ -1328,7 +1299,6 @@ li.pingback div p, li.trackback div p {
 }
 
 #storyline li img {
-	height: 50px;
 	display: none;
 }
 

themepack/cocknbull/style.css

@@ -31,11 +31,10 @@ body {
 }
 
 #sidebar-comicright {
+	margin-top: 5px;
 	float: right;
-	background: #ccc;
+	height: 305px;
-	height: 300px;
 	width: 98px;
-	border: solid 1px #000;
 }
 
 #menubar {
@@ -51,7 +50,7 @@ body {
 }
 
 #sidebar-left, #sidebar-right {
-	padding: 5px 0;
+	padding: 5px;
 	background: #000;
 }
 
@@ -66,3 +65,5 @@ body {
 .sidebar a:hover {
 	color: #ff0000;
 }
+
+.nav { display: none; }

themepack/moosemountain/style.css

@@ -120,10 +120,6 @@ h2 a:hover, h3 a:hover {
 	background: url('header.png');
 }
 
-#header h1 {
-	padding: 0;
-}
-
 #logo {
 	height: 158px;
 	width: 320px;
@@ -133,7 +129,7 @@ h2 a:hover, h3 a:hover {
 	text-indent: -9999px;
 }
 
-.description {
+#header h1, #header .description {
 	display: none;
 }
 
@@ -258,20 +254,6 @@ table#wp-calendar td {
 
 /* Sidebar */
 
-.sidebar ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-
-.sidebar ul li {
-	padding: 0;
-}
-
-.sidebar ul li ul li {
-	padding: 0;
-}
-
 .sidebar ul li ul li a {
 	color: #000;
 	text-decoration: none;
@@ -471,7 +453,6 @@ table#wp-calendar td {
 /* ARCHIVE */
 
 .comicarchiveframe {
-	margin: 20px 0 10px 0;
 	padding: 5px 10px 5px 10px;
 	border-width: 1px;
 	border-style: solid;
@@ -624,3 +605,55 @@ ol.commentlist {
 .userpage-info {
 	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 {
+	height: 25px;
+	line-height: 20px;
+	font-family: 'Arial', sans-serif;
+	font-weight: bold;
+	text-align: right;
+}
+		
+	.comment-balloon {
+		width: 30px;
+		height: 25px;
+		display: block;
+		margin: 0 0 0 5px;
+		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 .comment-balloon {
+			color: #000;
+		}
+	
+		.comment-link a:hover .comment-balloon {
+			color: #fff;
+			background-position: 0 -25px;
+		}
+		
+	.comment-balloon-empty {
+		font-size: 20px;
+		line-height: 30px;
+		}

themepack/spacecase/style.css

@@ -32,13 +32,21 @@ h1 a:hover, h2 a:hover, h3 a:hover {
 	color: #ff0000;
 }
 
-#comic img {
+#header {
-	border: solid 1px #000;
+	text-align: left;
+}
+
+#header h1 a {
+	color: #fff;
+}
+
+#header h1 a:hover {
+	color: #fff000;
 }
 
 #comic { 
 	padding: 5px;
-	background: #111 url('metal.png') repeat;
+	background: #fff;
 	-moz-border-radius: 10px 10px 0 0;
 	-khtml-border-radius: 10px 10px 0 0;
 	-webkit-border-radius: 10px 10px 0 0;
@@ -46,7 +54,7 @@ h1 a:hover, h2 a:hover, h3 a:hover {
 }
 
 #comic-foot {
-	background: #111 url('metal.png') repeat;
+	background: #fff;
 	-moz-border-radius: 0 0 10px 10px;
 	-khtml-border-radius: 0 0 10px 10px;
 	-webkit-border-radius: 0 0 10px 10px;
@@ -55,10 +63,7 @@ h1 a:hover, h2 a:hover, h3 a:hover {
 	margin-bottom: 5px;
 }
 
-#header {width: 980px; height: 140px; background: url('header.png') top center no-repeat; overflow: hidden;}
+.button { float: right; }
-#header h1 {padding: 0;}
-#header h1 a {display: block; width: 980px; height: 140px; text-indent: -9999px;}
-#header .description {display: none;}
 
 /* THE MENU */
 
@@ -216,6 +221,9 @@ h1 a:hover, h2 a:hover, h3 a:hover {
 		background: url('menu.png') 0 -50px;
 	}
 
+#content-wrapper {
+	padding: 5px 0;
+}
 
 .narrowcolumn { 
 	width: 558px;
@@ -561,13 +569,26 @@ h1 a:hover, h2 a:hover, h3 a:hover {
 	letter-spacing: normal;
 }
 
-/* Navigation Style */
-
-#comic_navi_wrapper a, #comic_navi_wrapper .navi, #comic_navi_wrapper .navi-void {
-	text-indent: -99999px;
-}
-
 .widget_sociable_widget {
 	margin: 0 auto;
 	padding: 0 0;
 }
+
+/* comments */
+
+#comment, #author, #email, #url {
+	padding: 2px;
+	color: #000;
+	font-family: 'Verdana' , sans-serif;
+	font-size: 12px;
+	background: #ccc;
+	border: 1px solid #888;
+	-moz-border-radius: 6px;
+	-khtml-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+}
+
+#comment:hover, #author:hover, #email:hover, #url:hover, #comment:focus, #author:focus, #email:focus, #url:focus {
+	background: #fff;
+}

widgets/archive-dropdown.php

@@ -10,13 +10,12 @@ Author URI: http://webcomicplanet.com/
 */
 
 function comicpress_archive_dropdown() { ?>
-<ul>
+	<div class="archive-dropdown-wrap">
-	<li 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'); ?> </select>
+			<?php wp_get_archives('type=monthly&format=option&show_post_count=1'); ?> 
-	</li>
+		</select>
-</ul>
+	</div>
 <?php }
 
 class widget_comicpress_archive_dropdown extends WP_Widget {

widgets/calendar.php

@@ -45,15 +45,12 @@ class widget_comicpress_calendar extends WP_Widget {
 		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; };
 		comicpress_calendar($instance);
 		echo $after_widget;
 	}
 	
 	function update($new_instance, $old_instance) {
 		$instance = $old_instance;
-		$instance['title'] = strip_tags($new_instance['title']);
 		$instance['thumbnail'] = strip_tags($new_instance['thumbnail']);
 		$instance['small'] = strip_tags($new_instance['small']);
 		$instance['medium'] = strip_tags($new_instance['medium']);
@@ -63,14 +60,12 @@ class widget_comicpress_calendar extends WP_Widget {
 	
 	function form($instance) {
 		$default_image = get_bloginfo('stylesheet_directory').'/images/cal/default.png';
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'thumbnail' => $default_image, 'small' => '', 'medium' => '', 'large' => '') );
+		$instance = wp_parse_args( (array) $instance, array( 'thumbnail' => $default_image, 'small' => '', 'medium' => '', 'large' => '') );
-		$title = strip_tags($instance['title']);
 		$thumbnail = strip_tags($instance['thumbnail']);
 		$small = strip_tags($instance['small']);
 		$medium = strip_tags($instance['medium']);
 		$large = strip_tags($instance['large']);
 		?>
-		<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('thumbnail'); ?>"><?php _e('Thumbnail URL (178px by 130px):','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('thumbnail'); ?>" name="<?php echo $this->get_field_name('thumbnail'); ?>" type="text" value="<?php echo attribute_escape($thumbnail); ?>" /></label></p>
 		<p><label for="<?php echo $this->get_field_id('small'); ?>"><?php _e('Wallpaper URL (Small):','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('small'); ?>" name="<?php echo $this->get_field_name('small'); ?>" type="text" value="<?php echo attribute_escape($small); ?>" /></label></p>
 		<p><label for="<?php echo $this->get_field_id('medium'); ?>"><?php _e('Wallpaper URL (Medium):','comicpress'); ?> <input class="widefat" id="<?php echo $this->get_field_id('medium'); ?>" name="<?php echo $this->get_field_name('medium'); ?>" type="text" value="<?php echo attribute_escape($medium); ?>" /></label></p>

widgets/comictitle.php

@@ -20,9 +20,9 @@ class widget_comicpress_comictitle extends WP_Widget {
 		global $post;
 		extract($args, EXTR_SKIP); 
 		
-		echo $before_widget; 
+		echo $before_widget;?>
-			the_title();
+		<a href="<?php the_permalink(); ?>"><?php the_title(); ?></a>
-		echo $after_widget;
+		<?php echo $after_widget;
 	}
 	
 	function update($new_instance, $old_instance) {

widgets/graphical-navigation.php

@@ -19,6 +19,8 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 	function widget($args, $instance) {
 		global $wp_query, $post;
 		
+		if (is_home() || is_single()) {
+			
 			$this_permalink = get_permalink();
 			
 			$temp_query = $wp_query->is_single;
@@ -64,6 +66,9 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 			if ($instance['random'] != 'off') { ?>
 				<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') { ?>
+				<div class="navi-comictitle"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></div>
+			<?php } 
 			if ($instance['comments'] != 'off') { ?>
 				<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 }
@@ -98,7 +103,7 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 			</div>
 			
 		<?php } 
-
+	}
 	
 	function update($new_instance, $old_instance) {
 		$instance = $old_instance;
@@ -113,6 +118,7 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		$instance['next'] = $new_instance['next'];
 		$instance['archive_path'] = strip_tags($new_instance['archive_path']);
 		$instance['buyprint'] = $new_instance['buyprint'];
+		$instance['comictitle'] = $new_instance['comictitle'];
 		
 		$instance['first_title'] = strip_tags($new_instance['first_title']);
 		$instance['last_title'] = strip_tags($new_instance['last_title']);
@@ -140,16 +146,17 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		'next' => 'on', 
 		'archive_path' => '', 
 		'buyprint' => 'off',
-					'first_title' => __('First','comicpress'),
+					'first_title' => 'First',
-					'last_title' => __('Latest','comicpress'),
+					'last_title' => 'Latest',
-					'story_prev_title' => __('Chapter','comicpress'),
+					'story_prev_title' => 'Chapter',
-					'story_next_title' => __('Chapter','comicpress'),
+					'story_next_title' => 'Chapter',
-					'previous_title' => __('Previous','comicpress'),  
+					'previous_title' => 'Previous',  
-					'random_title' => __('Random','comicpress'), 
+					'random_title' => 'Random', 
-					'archives_title' => __('Archives','comicpress'), 
+					'archives_title' => 'Archives', 
-					'comments_title' => __('Comments','comicpress'), 
+					'comments_title' => 'Comments', 
-					'next_title' => __('Next','comicpress'), 
+					'next_title' => 'Next', 
-					'buyprint_title' => __('Buy Print','comicpress')
+					'buyprint_title' => 'Buy Print',
+					'comictitle' => 'off'
 		 ) );
 		$first = $instance['first']; if (empty($first)) $first = 'on';
 		$last = $instance['last']; if (empty($last)) $last = 'on';
@@ -162,6 +169,8 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		$archive_path = $instance['archive_path'];
 		$next = $instance['next']; if (empty($next)) $next = 'on';
 		$buyprint = $instance['buyprint']; if (empty($buyprint)) $buyprint = 'off';
+		$comictitle = $instance['comictitle']; if (empty($comictitle)) $comictitle = 'off';
+		
 				
 		$first_title = $instance['first_title']; 
 		$last_title = $instance['last_title']; 
@@ -174,6 +183,9 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		$next_title = $instance['next_title']; 
 		$buyprint_title = $instance['buyprint_title'];
 
+		
+		
+		
 		?>
 	
 		<label for="<?php echo $this->get_field_id('first'); ?>"><strong><?php _e('First','comicpress'); ?></strong><br />
@@ -211,6 +223,10 @@ class widget_comicpress_graphical_navigation extends WP_Widget {
 		Title:<br />
 		<input class="widefat" id="<?php echo $this->get_field_id('story_next_title'); ?>" name="<?php echo $this->get_field_name('story_next_title'); ?>" type="text" value="<?php echo attribute_escape($story_next_title); ?>" /></label><br />
 		
+		<br />
+		<label for="<?php echo $this->get_field_id('comictitle'); ?>"><strong><?php _e('Comic Title','comicpress'); ?></strong><br />
+		<input id="<?php echo $this->get_field_id('comictitle'); ?>" name="<?php echo $this->get_field_name('comictitle'); ?>" type="radio" value="on"<?php if ( $comictitle == "on") { echo " checked"; } ?> />On</label>&nbsp;<input id="<?php echo $this->get_field_id('comictitle'); ?>" name="<?php echo $this->get_field_name('comictitle'); ?>" type="radio" value="off"<?php if ( $comictitle == "off") { echo " checked"; } ?> />Off<br />
+		
 		<br />
 		<label for="<?php echo $this->get_field_id('archives'); ?>"><strong><?php _e('Archives','comicpress'); ?></strong><br />
 		<input id="<?php echo $this->get_field_id('archives'); ?>" name="<?php echo $this->get_field_name('archives'); ?>" type="radio" value="on"<?php if ( $archives == "on") { echo " checked"; } ?> />On</label>&nbsp;<input id="<?php echo $this->get_field_id('archives'); ?>" name="<?php echo $this->get_field_name('archives'); ?>" type="radio" value="off"<?php if ( $archives == "off") { echo " checked"; } ?> />Off<br />

widgets/latestthumb.php

@@ -27,7 +27,8 @@ class widget_comicpress_latest_thumbnail extends WP_Widget {
 			$latestcomics = get_posts('numberposts=1&category='.get_all_comic_categories_as_cat_string());
 			foreach($latestcomics as $post) : ?>
 				<center>
-				<a href="<?php the_permalink(); ?>"><img src="<?php the_comic_rss() ?>" alt="<?php the_title() ?>" title="<?php the_hovertext() ?>" /></a><br />
+				<a href="<?php the_permalink(); ?>"><img src="<?php the_comic_mini() ?>" alt="<?php the_title() ?> - <?php the_date(); ?>" title="<?php the_hovertext() ?>" /></a><br />
+				<span class="latest_thumbnail_date"><?php the_date(); ?></span>
 				</center>
 				<?php endforeach; 
 			echo $after_widget;

widgets/permalink.php

@@ -21,7 +21,7 @@ class widget_comicpress_permalink 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']) ? '' : apply_filters('widget_title', $instance['title']); ?>
 		<a href="<?php the_permalink(); ?><?php if ($instance['comment'] == 'yes') { ?>#comment<?php } ?>" class="widget_permalink_href"><?php echo $title; ?></a>
 		<?php
 		echo $after_widget;

widgets/randompost.php

@@ -36,7 +36,7 @@ class widget_comicpress_random_post extends WP_Widget {
 		echo $before_widget;
 		$title = empty($instance['title']) ? '' : apply_filters('widget_title', $instance['title']); 
 		if ( !empty( $title ) ) { echo $before_title . $title . $after_title; }; ?>
-			<h2><a href="?randompost"><span class="random-comic-icon">?</span> <?php _e('Random Post','comicpress'); ?></a></h2>
+			<h2><a href="?randompost"><span class="random-post-icon">?</span> <?php _e('Random Post','comicpress'); ?></a></h2>
 		<?php
 		echo $after_widget;
 	}